diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 24f9f057b65a..6c8ad8225f0b 100644 --- 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; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 68032ebe8497..74bdacd95845 100644 --- 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: diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 7df426177483..74c2503523e8 100644 --- 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 diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 4755c80e707c..2a7e6cb0df95 100644 --- 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, diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7c324e646a4d..255c3ebfdeb9 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index da1f25ad2c3e..283682708840 100644 --- 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) [ diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 50b1a94c7795..0264c0ff10c5 100644 --- 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 ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 72986e7bda1e..8db7f6c9169d 100644 --- 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. diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix index 5b086d5f1a7f..47bc8860bc54 100644 --- 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 = '' diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index b82fe568e2a9..432767b9f984 100644 --- 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. diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index b6ac0a1fa132..28b09222b472 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 60eba0577b03..fe35126ea26c 100644 --- 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 = [ diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 7ecba3b7d3b1..8d0c597a1af0 100644 --- 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 ]; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 3a720bf328f3..ff312cbff891 100644 --- 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 diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 0253ed5a5138..47cc882f548e 100644 --- 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. diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index f8e240ca57e4..0020a4bf433f 100644 --- 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 diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6c576f0b85e9..a3e00dff4ef6 100644 --- 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 { diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index a0b5c9799254..7aa955e99e25 100644 --- 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"; diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 13d037515c3f..5b7b17c8bb84 100644 --- 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 diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 7737205ce02d..c183e3741429 100644 --- 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 ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 0e13e4c5f35c..1a60d7d013ef 100644 --- 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 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8c11398d6b9a..d84505d22a62 100644 --- 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 640f1fdc2521..8ecef5f04efa 100644 --- 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 { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index decf36f31e8b..48ddb18291af 100644 --- 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 { };