diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2019-01-21 22:48:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-21 22:48:12 +0100 |
commit | 387d8379285a84f77e33fedcf7cd91022b094228 (patch) | |
tree | d5a9e50a6da63b1931de01f707d194fed0d1649d | |
parent | f30355eedbf0e6daa663443c815eb363ab9268c1 (diff) | |
download | nixlib-387d8379285a84f77e33fedcf7cd91022b094228.tar nixlib-387d8379285a84f77e33fedcf7cd91022b094228.tar.gz nixlib-387d8379285a84f77e33fedcf7cd91022b094228.tar.bz2 nixlib-387d8379285a84f77e33fedcf7cd91022b094228.tar.lz nixlib-387d8379285a84f77e33fedcf7cd91022b094228.tar.xz nixlib-387d8379285a84f77e33fedcf7cd91022b094228.tar.zst nixlib-387d8379285a84f77e33fedcf7cd91022b094228.zip |
Revert "python: pytest_37: init at 3.7.4" (#54429)
This reverts commit eb2d56cb275672a0ccb8667e22e68cfe162a9b4e since python.pkgs.pytest_37 is no longer used.
-rw-r--r-- | pkgs/development/python-modules/pytest/default.nix | 85 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 38 insertions, 51 deletions
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index dc928130cbb1..9412a750a9ab 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,59 +2,46 @@ , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2 }: +buildPythonPackage rec { + version = "3.9.3"; + pname = "pytest"; -let generic = { version, sha256 }: - buildPythonPackage rec { - pname = "pytest"; - inherit version; + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - src = fetchPypi { - inherit pname version sha256; - }; - - checkInputs = [ hypothesis mock ]; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] - ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; - - checkPhase = '' - runHook preCheck - $out/bin/py.test -x testing/ - 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; - }; - }; - -in { - pytest_39 = generic { - version = "3.9.3"; + src = fetchPypi { + inherit pname version; sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db"; }; - pytest_37 = generic { - version = "3.7.4"; - sha256 = "2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349"; + checkInputs = [ hypothesis mock ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ + 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcfffb7651ed..d651ca25f0b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1440,10 +1440,10 @@ in { 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 = self.hypothesis.override { doCheck = false; }; - }) pytest_39 pytest_37; + }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; |