summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2021-07-20 23:07:53 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2021-07-21 13:32:49 +0200
commit9bfdf57e139e7e3b253979da828285bb8284a217 (patch)
tree3e28797f722e0de7188f54f1d11ff7ef07db1cb4 /pkgs/top-level
parent4209fed914e4362f952f4fa6d88c1808aa3df7b8 (diff)
downloadnixpkgs-9bfdf57e139e7e3b253979da828285bb8284a217.tar
nixpkgs-9bfdf57e139e7e3b253979da828285bb8284a217.tar.gz
nixpkgs-9bfdf57e139e7e3b253979da828285bb8284a217.tar.bz2
nixpkgs-9bfdf57e139e7e3b253979da828285bb8284a217.tar.lz
nixpkgs-9bfdf57e139e7e3b253979da828285bb8284a217.tar.xz
nixpkgs-9bfdf57e139e7e3b253979da828285bb8284a217.tar.zst
nixpkgs-9bfdf57e139e7e3b253979da828285bb8284a217.zip
pythonPackages: deprecate pytestrunner alias
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-aliases.nix1
-rw-r--r--pkgs/top-level/python-packages.nix3
-rw-r--r--pkgs/top-level/python2-packages.nix2
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b64a5bb748e..3fe3b02860d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25540,7 +25540,7 @@ in
 
   matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli {
     inherit (python3Packages) buildPythonApplication buildPythonPackage
-      pygobject3 pytestrunner requests responses pytest python-olm
+      pygobject3 pytest-runner requests responses pytest python-olm
       canonicaljson;
   };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f42713fee3d..7e74bce1f7b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -55,6 +55,7 @@ mapAliases ({
   pytestcov = pytest-cov; # added 2021-01-04
   pytest-pep8 = pytestpep8; # added 2021-01-04
   pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
+  pytestrunner = pytest-runner; # added 2021-01-04
   qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
   rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
   selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f689a562a49..3a811bc9b7d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6883,8 +6883,7 @@ in {
 
   pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
 
-  pytest-runner = self.pytestrunner; # added 2021-01-04
-  pytestrunner = callPackage ../development/python-modules/pytestrunner { };
+  pytest-runner = callPackage ../development/python-modules/pytest-runner { };
 
   pytest-sanic = callPackage ../development/python-modules/pytest-sanic {
     sanic = self.sanic.override { doCheck = false; };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 471548b9fa2..decf36f31e8 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -478,7 +478,7 @@ with self; with super; {
 
   pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { };
 
-  pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { };
+  pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { };
 
   pytest_xdist = self.pytest-xdist; # added 2021-01-04
   pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { };