public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "python: pytest_37: init at 3.7.4" (#54429)

Browse Source 
This reverts commit eb2d56cb275672a0ccb8667e22e68cfe162a9b4e
since python.pkgs.pytest_37 is no longer used.
This commit is contained in:
Robert Schütz 2019-01-21 22:48:12 +01:00 committed by GitHub
parent f30355eedb
commit 387d837928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/python-modules/pytest/default.nix
View File

@ -2,11 +2,9 @@
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock, writeText, pathlib2 , atomicwrites, mock, writeText, pathlib2
}: }:
buildPythonPackage rec {
let generic = { version, sha256 }: version = "3.9.3";
buildPythonPackage rec {
pname = "pytest"; pname = "pytest";
inherit version;
preCheck = '' preCheck = ''
# don't test bash builtins # don't test bash builtins
@ -14,7 +12,8 @@ let generic = { version, sha256 }:
''; '';
src = fetchPypi { src = fetchPypi {
inherit pname version sha256; inherit pname version;
sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db";
}; };
checkInputs = [ hypothesis mock ]; checkInputs = [ hypothesis mock ];
@ -45,16 +44,4 @@ let generic = { version, sha256 }:
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
}; };
};
in {
pytest_39 = generic {
version = "3.9.3";
sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db";
};
pytest_37 = generic {
version = "3.7.4";
sha256 = "2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349";
};
} }

4
pkgs/top-level/python-packages.nix
View File

@ -1440,10 +1440,10 @@ in {
pytest = self.pytest_39; pytest = self.pytest_39;
inherit (callPackage ../development/python-modules/pytest { pytest_39 = callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle # hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; }; hypothesis = self.hypothesis.override { doCheck = false; };
}) pytest_39 pytest_37; };
pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };