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

pythonPackages.pytest: 4.2.1 -> 4.6.3

Browse Source
This commit is contained in:
Mario Rodas 2019-05-24 20:02:00 -05:00 committed by Frederik Rietdijk
parent 96a662161c
commit 1a7ffb4140
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock, writeText, pathlib2
, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging
}:
buildPythonPackage rec {
version = "4.2.1";
version = "4.6.3";
pname = "pytest";
preCheck = ''
@ -13,12 +13,12 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c";
sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45";
};
checkInputs = [ hypothesis mock ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];

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

@ -1688,9 +1688,9 @@ in {
pyhepmc = callPackage ../development/python-modules/pyhepmc { };
pytest = self.pytest_42;
pytest = self.pytest_4;
pytest_42 = callPackage ../development/python-modules/pytest {
pytest_4 = callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; };
};