diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 17:16:43 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-18 11:48:40 +0200 |
commit | b3ddab852a5229331553e07be6055fb015966b42 (patch) | |
tree | f15ca5c93e856b4454e4200cf14321f19e593233 | |
parent | 1615ce80b151f534c2f1807d288ca785c4b2dd21 (diff) | |
download | nixlib-b3ddab852a5229331553e07be6055fb015966b42.tar nixlib-b3ddab852a5229331553e07be6055fb015966b42.tar.gz nixlib-b3ddab852a5229331553e07be6055fb015966b42.tar.bz2 nixlib-b3ddab852a5229331553e07be6055fb015966b42.tar.lz nixlib-b3ddab852a5229331553e07be6055fb015966b42.tar.xz nixlib-b3ddab852a5229331553e07be6055fb015966b42.tar.zst nixlib-b3ddab852a5229331553e07be6055fb015966b42.zip |
pythonPackages.pytest: 4.6.5 -> 5.1.0 in case of Python 3
-rw-r--r-- | pkgs/development/python-modules/pytest/2.nix | 48 | ||||
-rw-r--r-- | pkgs/development/python-modules/pytest/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 15 |
3 files changed, 61 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/pytest/2.nix b/pkgs/development/python-modules/pytest/2.nix new file mode 100644 index 000000000000..7a43a2e2517b --- /dev/null +++ b/pkgs/development/python-modules/pytest/2.nix @@ -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; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7a43a2e2517b..7866454a62fa 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -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 ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2acad1551283..1ea3d6adfb2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; |