From 5df004f48b18fc9b53ff038927772d36cd4f845a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 21:44:34 +0100 Subject: [PATCH] python2Packages.pytest-xdist: drop --- .../python2-modules/hypothesis/default.nix | 2 - .../python2-modules/pytest-xdist/default.nix | 59 ------------------- pkgs/top-level/python2-packages.nix | 2 +- 3 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/development/python2-modules/pytest-xdist/default.nix diff --git a/pkgs/development/python2-modules/hypothesis/default.nix b/pkgs/development/python2-modules/hypothesis/default.nix index d2b8c9066f89..70fe9682b824 100644 --- a/pkgs/development/python2-modules/hypothesis/default.nix +++ b/pkgs/development/python2-modules/hypothesis/default.nix @@ -7,7 +7,6 @@ pexpect, doCheck ? true, pytest, - pytest-xdist, flaky, mock, sortedcontainers, @@ -41,7 +40,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-xdist flaky mock pexpect diff --git a/pkgs/development/python2-modules/pytest-xdist/default.nix b/pkgs/development/python2-modules/pytest-xdist/default.nix deleted file mode 100644 index 96db76de1488..000000000000 --- a/pkgs/development/python2-modules/pytest-xdist/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, - execnet, - pytest, - setuptools-scm, - pytest-forked, - filelock, - psutil, - six, - isPy3k, -}: - -buildPythonPackage rec { - pname = "pytest-xdist"; - version = "1.34.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; - }; - - nativeBuildInputs = [ - setuptools-scm - pytest - ]; - nativeCheckInputs = [ - pytest - filelock - ]; - propagatedBuildInputs = [ - execnet - pytest-forked - psutil - six - ]; - - # Encountered a memory leak - # https://github.com/pytest-dev/pytest-xdist/issues/462 - doCheck = !isPy3k; - - checkPhase = '' - # Excluded tests access file system - py.test testing -k "not test_distribution_rsyncdirs_example \ - and not test_rsync_popen_with_path \ - and not test_popen_rsync_subdir \ - and not test_init_rsync_roots \ - and not test_rsyncignore" - ''; - - meta = { - description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; - homepage = "https://github.com/pytest-dev/pytest-xdist"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 9bc34161cd6f..f6a1d61337a8 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -60,7 +60,7 @@ with super; }; }; - pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { }; + pytest-xdist = disabled super.pytest-xdist; recoll = disabled super.recoll;