From b9b3be8e099f188b64af96742e4e78e025ff8794 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 28 Jul 2023 23:47:36 +0900 Subject: [PATCH] python310Packages.backports_functools_lru_cache: remove we no longer need to backport to python3.2 --- .../backports_functools_lru_cache/default.nix | 32 ------------------- .../python-modules/soupsieve/default.nix | 1 - .../python-modules/wcwidth/default.nix | 6 +--- .../poetry2nix/overrides/default.nix | 4 +-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 6 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/backports_functools_lru_cache/default.nix diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix deleted file mode 100644 index 0045a795039..00000000000 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -, isPy3k -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "backports.functools_lru_cache"; - version = "1.6.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - # Test fail on Python 2 - doCheck = isPy3k; - - pythonNamespaces = [ "backports" ]; - - meta = { - description = "Backport of functools.lru_cache"; - homepage = "https://github.com/jaraco/backports.functools_lru_cache"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index cd5a0cd1940..e26a04192f4 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -3,7 +3,6 @@ , fetchPypi , hatchling , isPy3k -, backports_functools_lru_cache }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 21f3a7b4409..1d23225c2fd 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,6 +1,4 @@ { lib, fetchPypi, buildPythonPackage, pytestCheckHook -, isPy3k -, backports_functools_lru_cache , setuptools }: @@ -15,9 +13,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ setuptools ] ++ lib.optionals (!isPy3k) [ - backports_functools_lru_cache - ]; + propagatedBuildInputs = [ setuptools ]; # To prevent infinite recursion with pytest doCheck = false; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index ed8f1c99c44..14338423ec3 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -2963,9 +2963,7 @@ lib.composeManyExtensions [ }); wcwidth = super.wcwidth.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ - lib.optional self.isPy27 (self.backports-functools-lru-cache or self.backports_functools_lru_cache) - ; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]); }); wtforms = super.wtforms.overridePythonAttrs (old: { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d4b05723b09..435557f2d17 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -49,6 +49,7 @@ mapAliases ({ awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 backports_csv = throw "backports_csv has been removed, since we no longer need to backport to python2"; # added 2023-07-28 + backports_functools_lru_cache = throw "backports_functools_lru_cache has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 BlinkStick = blinkstick; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2e50c0ceab..5da873383e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1203,8 +1203,6 @@ self: super: with self; { backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; - backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; - backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { };