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

pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

Browse Source
This commit is contained in:
Jan Malakhovski 2018-03-30 00:01:53 +00:00
parent 2badf9a6f8
commit acbee90e2b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/hypothesis/default.nix
View File

@ -20,9 +20,9 @@ buildPythonPackage rec {
sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
};
checkInputs = [ pytest pytest_xdist flaky mock ];
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
checkInputs = [ pytest pytest_xdist flaky mock ];
inherit doCheck;
# https://github.com/DRMacIver/hypothesis/issues/300

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

@ -1923,11 +1923,8 @@ in {
pytest = self.pytest_36;
pytest_36 = callPackage ../development/python-modules/pytest {
hypothesis = self.hypothesis.override {
# hypothesis requires pytest that causes dependency cycle
doCheck = false;
pytest = null;
};
# hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; };
};
# Needed for celery