From 27bffc8cc2a116755172ebe32ecaba1f1f67586a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 23:52:56 +0200 Subject: [PATCH] python312Packages.selectors2: drop --- .../python-modules/selectors2/default.nix | 43 ------------------- .../selectors2/mapping-import.patch | 14 ------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/development/python-modules/selectors2/default.nix delete mode 100644 pkgs/development/python-modules/selectors2/mapping-import.patch diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix deleted file mode 100644 index b2b79711c259..000000000000 --- a/pkgs/development/python-modules/selectors2/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - psutil, - mock, -}: - -buildPythonPackage rec { - version = "2.0.2"; - format = "setuptools"; - pname = "selectors2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1f1bbaac203a23fbc851dc1b5a6e92c50698cc8cefa5873eb5b89eef53d1d82b"; - }; - - patches = [ ./mapping-import.patch ]; - - nativeCheckInputs = [ - nose - psutil - mock - ]; - - checkPhase = '' - # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 - # Trick to disable certain tests that depend on timing which - # will always fail on hydra - export TRAVIS="" - nosetests tests/test_selectors2.py \ - --exclude=test_above_fd_setsize - ''; - - meta = with lib; { - homepage = "https://www.github.com/SethMichaelLarson/selectors2"; - description = "Back-ported, durable, and portable selectors"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/selectors2/mapping-import.patch b/pkgs/development/python-modules/selectors2/mapping-import.patch deleted file mode 100644 index 64f74a5ce29b..000000000000 --- a/pkgs/development/python-modules/selectors2/mapping-import.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/selectors2.py b/selectors2.py -index 1625a30..c4a1231 100644 ---- a/selectors2.py -+++ b/selectors2.py -@@ -22,7 +22,8 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - # SOFTWARE. - --from collections import namedtuple, Mapping -+from collections import namedtuple -+from collections.abc import Mapping - import errno - import math - import platform diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1798f32356a7..de3494b68f62 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -521,6 +521,7 @@ mapAliases ({ scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 + selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..1065d3ab38c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14044,8 +14044,6 @@ self: super: with self; { inherit (pkgs) cmake ninja; }; - selectors2 = callPackage ../development/python-modules/selectors2 { }; - selenium = callPackage ../development/python-modules/selenium { }; selenium-wire = callPackage ../development/python-modules/selenium-wire { };