diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index d9a340d82491..898d209d9138 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -8,7 +8,6 @@ , mock , peewee , pytest-django -, pytest-pythonpath , pytestCheckHook , six , sqlalchemy @@ -38,7 +37,6 @@ buildPythonPackage rec { mock peewee pytest-django - pytest-pythonpath pytestCheckHook sqlalchemy webtest @@ -54,6 +52,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" \ --replace "--cov nplusone --cov-report term-missing" "" ''; diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix deleted file mode 100644 index 8c3fb48b430e..000000000000 --- a/pkgs/development/python-modules/pytest-pythonpath/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, pytest }: - -buildPythonPackage rec { - pname = "pytest-pythonpath"; - version = "0.7.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ZOGVsjqPjAxjH7Fogtmtb6QTftHylh3dFdUgZc1DXbY="; - }; - - buildInputs = [ pytest ]; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; - - meta = with lib; { - description = - "Pytest plugin for adding to the PYTHONPATH from command line or configs"; - homepage = "https://github.com/bigsassy/pytest-pythonpath"; - maintainers = with maintainers; [ cript0nauta ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix index 8e41d26921fa..115014a25bbb 100644 --- a/pkgs/development/python-modules/pyverilog/default.nix +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -5,7 +5,6 @@ , jinja2 , ply , verilog -, pytest-pythonpath , pytestCheckHook }: @@ -32,8 +31,12 @@ buildPythonPackage rec { verilog ]; + preCheck = '' + substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" + ''; + checkInputs = [ - pytest-pythonpath pytestCheckHook ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b8ea307917db..05ebce6357c6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -92,6 +92,7 @@ mapAliases ({ pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 + pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cfc1521a8ab..989f0680881a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7891,8 +7891,6 @@ in { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { };