alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pythonPackages.pytest: 4.6.5 -> 5.1.0 in case of Python 3

Browse source
This commit is contained in:
Frederik Rietdijk 2019-08-17 17:16:43 +02:00
parent 1615ce80b1
commit b3ddab852a
3 changed files with 61 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
pkgs/development/python-modules/pytest/2.nix Normal file
View file

@ -0,0 +1,48 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
}:
buildPythonPackage rec {
version = "4.6.5";
pname = "pytest";
preCheck = ''
# don't test bash builtins
rm testing/test_argcomplete.py
'';
src = fetchPypi {
inherit pname version;
sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347";
};
checkInputs = [ hypothesis mock ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
checkPhase = ''
runHook preCheck
$out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
runHook postCheck
'';
# Remove .pytest_cache when using py.test in a Nix build
setupHook = writeText "pytest-hook" ''
pytestcachePhase() {
find $out -name .pytest_cache -type d -exec rm -rf {} +
}
preDistPhases+=" pytestcachePhase"
'';
meta = with stdenv.lib; {
homepage = https://docs.pytest.org;
description = "Framework for writing tests";
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
license = licenses.mit;
platforms = platforms.unix;
};
}

7
pkgs/development/python-modules/pytest/default.nix
View file

@ -3,7 +3,7 @@
, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
}:
buildPythonPackage rec {
version = "4.6.5";
version = "5.1.0";
pname = "pytest";
preCheck = ''
@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347";
sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031";
};
checkInputs = [ hypothesis mock ];
@ -23,9 +23,10 @@ buildPythonPackage rec {
++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
# Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929
checkPhase = ''
runHook preCheck
$out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
$out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py
runHook postCheck
'';

15
pkgs/top-level/python-packages.nix
View file

@ -1949,12 +1949,15 @@ in {
pyhepmc = callPackage ../development/python-modules/pyhepmc { };
pytest = self.pytest_4;
pytest_4 = callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; };
};
pytest = if isPy3k then
callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; };
}
else callPackage ../development/python-modules/pytest/2.nix {
# hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; };
};
pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };