pythonPackages: deprecate pytest_xdist alias

2024-10-31 14:41:27 +00:00 · 2021-07-20 23:08:56 +02:00 · 2021-07-20 23:08:56 +02:00 · 2e9c330216
commit 2e9c330216
parent dd712027be
24 changed files with 37 additions and 38 deletions
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {

  nativeBuildInputs = [ wrapGAppsHook gettext ];

-  checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]);
+  checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]);

  buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
    ++ (if xineBackend then [ xine-lib ] else with gst_all_1;
--- a/pkgs/applications/office/paperless/default.nix
+++ b/pkgs/applications/office/paperless/default.nix
@ -148,7 +148,7 @@ let
    pytest
    pytest-django
    pytest-env
-    pytest_xdist
+    pytest-xdist
  ];

  pyocrWithUserTesseract = pyPkgs:
--- a/pkgs/development/compilers/vyper/default.nix
+++ b/pkgs/development/compilers/vyper/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, writeText, asttokens
-, pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx
+, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx
 , sphinx_rtd_theme, pytest-runner }:

 let
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, aria2, poetry, pytest, pytest-cov, pytest_xdist, responses
+, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses
 , asciimatics, loguru, requests, setuptools, websocket-client
 }:

@ -22,7 +22,7 @@ buildPythonPackage rec {
    export HOME=$TMPDIR
  '';

-  checkInputs = [ aria2 responses pytest pytest-cov pytest_xdist ];
+  checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ];

  # Tests are not all stable/deterministic,
  # they rely on actually running an aria2c daemon and communicating with it,
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@ -4,7 +4,7 @@
 , fetchFromGitHub
 , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
 , dialog, gnureadline
-, pytest_xdist, pytestCheckHook, python-dateutil
+, pytest-xdist, pytestCheckHook, python-dateutil
 }:

 buildPythonPackage rec {
@ -42,7 +42,7 @@ buildPythonPackage rec {
  checkInputs = [
    python-dateutil
    pytestCheckHook
-    pytest_xdist
+    pytest-xdist
  ];

  pytestFlagsArray = [
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@ -8,7 +8,7 @@
 , flask
 , psutil
 , pytest-timeout
-, pytest_xdist
+, pytest-xdist
 , pytestCheckHook
 , requests
 , isPy27
@ -75,7 +75,7 @@ buildPythonPackage rec {
    flask
    psutil
    pytest-timeout
-    pytest_xdist
+    pytest-xdist
    pytestCheckHook
    requests
  ] ++ lib.optionals (!isPy27) [
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/pkgs/development/python-modules/diskcache/default.nix
@ -4,7 +4,7 @@
 , fetchFromGitHub
 , pytestCheckHook
 , pytest-cov
-, pytest_xdist
+, pytest-xdist
 , pytest-django
 , mock
 }:
@ -23,7 +23,7 @@ buildPythonPackage rec {
  checkInputs = [
    pytestCheckHook
    pytest-cov
-    pytest_xdist
+    pytest-xdist
    pytest-django
    mock
  ];
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock
-, pytest_xdist, covCore, glibcLocales }:
+, pytest-xdist, covCore, glibcLocales }:

 buildPythonPackage rec {
  pname = "dyn";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    pytest
    pytest-cov
    mock
-    pytest_xdist
+    pytest-xdist
    covCore
  ];
  # Disable checks because they are not stateless and require internet access.
--- a/pkgs/development/python-modules/hypothesis/2.nix
+++ b/pkgs/development/python-modules/hypothesis/2.nix
@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchFromGitHub
 , isPy3k, attrs, coverage, enum34, pexpect
-, doCheck ? true, pytest, pytest_xdist, flaky, mock
+, doCheck ? true, pytest, pytest-xdist, flaky, mock
 , sortedcontainers
 }:
 buildPythonPackage rec {
@ -29,7 +29,7 @@ buildPythonPackage rec {
    sortedcontainers
  ] ++ lib.optional (!isPy3k) enum34;

-  checkInputs = [ pytest pytest_xdist flaky mock pexpect ];
+  checkInputs = [ pytest pytest-xdist flaky mock pexpect ];
  inherit doCheck;

  checkPhase = ''
--- a/pkgs/development/python-modules/ignite/default.nix
+++ b/pkgs/development/python-modules/ignite/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
-, pytest_xdist
+, pytest-xdist
 , pythonOlder
 , matplotlib
 , mock
@ -23,7 +23,7 @@ buildPythonPackage rec {
    sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij";
  };

-  checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ];
+  checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ];
  propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ];

  # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi
-, pytest, pytest-cov, pytest_xdist
+, pytest, pytest-cov, pytest-xdist
 , six, numpy, scipy, pyyaml, h5py
 , keras-applications, keras-preprocessing
 }:
@ -16,7 +16,7 @@ buildPythonPackage rec {
  checkInputs = [
    pytest
    pytest-cov
-    pytest_xdist
+    pytest-xdist
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/lazy_import/default.nix
+++ b/pkgs/development/python-modules/lazy_import/default.nix
@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi
 , pytest
-, pytest_xdist
+, pytest-xdist
 , six }:

 buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {

  checkInputs = [
    pytest
-    pytest_xdist
+    pytest-xdist
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@ -19,7 +19,7 @@
 , pybids
 , pydot
 , pytest
-, pytest_xdist
+, pytest-xdist
 , pytest-forked
 , rdflib
 , scipy
@ -93,7 +93,7 @@ buildPythonPackage rec {
    mock
    pytest
    pytest-forked
-    pytest_xdist
+    pytest-xdist
    pytest-cov
    which
  ];
--- a/pkgs/development/python-modules/psautohint/default.nix
+++ b/pkgs/development/python-modules/psautohint/default.nix
@ -2,7 +2,7 @@
 , fonttools
 , lxml, fs # for fonttools extras
 , setuptools-scm
-, pytestCheckHook, pytest-cov, pytest_xdist
+, pytestCheckHook, pytest-cov, pytest-xdist
 }:

 buildPythonPackage rec {
@ -32,7 +32,7 @@ buildPythonPackage rec {
  checkInputs = [
    pytestCheckHook
    pytest-cov
-    pytest_xdist
+    pytest-xdist
  ];
  disabledTests = [
    # Test that fails on pytest >= v6
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@ -5,7 +5,7 @@
 , django
 , setuptools-scm
 , django-configurations
-, pytest_xdist
+, pytest-xdist
 , six
 }:
 buildPythonPackage rec {
@ -18,7 +18,7 @@ buildPythonPackage rec {
  };

  nativeBuildInputs = [ pytest setuptools-scm ];
-  checkInputs = [ pytest django-configurations pytest_xdist six ];
+  checkInputs = [ pytest django-configurations pytest-xdist six ];
  propagatedBuildInputs = [ django ];

  # Complicated. Requires Django setup.
--- a/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/pkgs/development/python-modules/pytest-randomly/default.nix
@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , factory_boy, faker, numpy, backports-entry-points-selectable
-, pytestCheckHook, pytest_xdist
+, pytestCheckHook, pytest-xdist
 }:

 buildPythonPackage rec {
@ -23,7 +23,7 @@ buildPythonPackage rec {

  checkInputs = [
    pytestCheckHook
-    pytest_xdist
+    pytest-xdist
    numpy
    factory_boy
    faker
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@ -9,7 +9,7 @@
 , mock
 , pysqlite ? null
 , pytestCheckHook
-, pytest_xdist
+, pytest-xdist
 }:

 buildPythonPackage rec {
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest_xdist }:
+{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }:

 buildPythonPackage rec {
  pname = "stripe";
@ -15,7 +15,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ requests ];

-  checkInputs = [ pytest pytest-cov pytest-mock pytest_xdist ];
+  checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ];

  meta = with lib; {
    description = "Stripe Python bindings";
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@ -5,7 +5,7 @@
 , pytestCheckHook
 , shellingham
 , pytest-cov
-, pytest_xdist
+, pytest-xdist
 , pytest-sugar
 , coverage
 , mypy
@ -27,7 +27,7 @@ buildPythonPackage rec {
  checkInputs = [
    pytestCheckHook
    pytest-cov
-    pytest_xdist
+    pytest-xdist
    pytest-sugar
    shellingham
    coverage
--- a/pkgs/tools/admin/lexicon/default.nix
+++ b/pkgs/tools/admin/lexicon/default.nix
@ -66,7 +66,7 @@ buildPythonApplication rec {
    mock
    pytest
    pytest-cov
-    pytest_xdist
+    pytest-xdist
    vcrpy
  ];

--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@ -64,7 +64,7 @@ buildPythonApplication rec {
    pypdf2
    pytest
    pytest-helpers-namespace
-    pytest_xdist
+    pytest-xdist
    pytest-cov
    python-xmp-toolkit
    pytestCheckHook
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -57,6 +57,7 @@ mapAliases ({
  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
+  pytest_xdist = pytest-xdist; # 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
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -6926,7 +6926,6 @@ in {

  pytest-watch = callPackage ../development/python-modules/pytest-watch { };

-  pytest_xdist = self.pytest-xdist; # added 2021-01-04
  pytest-xdist = callPackage ../development/python-modules/pytest-xdist { };

  pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@ -480,7 +480,6 @@ with self; with super; {

  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 { };

  python-otr = callPackage ../development/python-modules/python-otr { };