diff --git a/pkgs/by-name/re/replacement/package.nix b/pkgs/by-name/re/replacement/package.nix index 97c24a44a4f8..0802d55315b4 100644 --- a/pkgs/by-name/re/replacement/package.nix +++ b/pkgs/by-name/re/replacement/package.nix @@ -9,8 +9,6 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "0.4.4"; pyproject = true; - disabled = python3Packages.isPy27; - src = fetchFromGitHub { owner = "siriobalmelli"; repo = "replacement"; diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index 1bb120cb8165..005ba62ba742 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -109,12 +109,10 @@ let ); in rec { - isPy27 = pythonVersion == "2.7"; isPy311 = pythonVersion == "3.11"; isPy312 = pythonVersion == "3.12"; isPy313 = pythonVersion == "3.13"; isPy314 = pythonVersion == "3.14"; - isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; isPyPy = lib.hasInfix "pypy" interpreter; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 000b23a6955a..68b10dfc8c6a 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -190,7 +190,6 @@ in { inherit lib pkgs stdenv; inherit (python.passthru) - isPy27 isPy311 isPy312 isPy313 diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 7bcf18ee24d6..ee5c35e27fae 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -5,7 +5,6 @@ setuptools, pytestCheckHook, pytest-asyncio, - isPy27, }: buildPythonPackage rec { @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.2.2"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "fantix"; repo = "aiocontextvars"; diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix index 87784477ccbd..4bc47fe3bd51 100644 --- a/pkgs/development/python-modules/aspell-python/default.nix +++ b/pkgs/development/python-modules/aspell-python/default.nix @@ -4,7 +4,6 @@ aspellDicts, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.15"; pyproject = true; - disabled = isPy27; - src = fetchPypi { pname = "aspell-python-py3"; inherit version; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 3a74d1e2c350..504834368922 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, autoconf, automake, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "3.1.1"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix index 45b1d5407db4..e21dcbfa9f61 100644 --- a/pkgs/development/python-modules/basiciw/default.nix +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -4,7 +4,6 @@ fetchPypi, gcc, wirelesstools, - isPy27, isPyPy, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "0.2.2"; format = "setuptools"; - disabled = isPy27 || isPyPy; + disabled = isPyPy; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index aad6383f249e..bd556adcaef3 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -12,11 +12,8 @@ sqlalchemy, pycrypto, cryptography, - isPy27, pytestCheckHook, setuptools, - funcsigs ? null, - pycryptopp ? null, }: buildPythonPackage rec { @@ -38,10 +35,6 @@ buildPythonPackage rec { sqlalchemy pycrypto cryptography - ] - ++ lib.optionals isPy27 [ - funcsigs - pycryptopp ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix index d3035a11df13..32b08f75003d 100644 --- a/pkgs/development/python-modules/ci-info/default.nix +++ b/pkgs/development/python-modules/ci-info/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, pytest, pytestCheckHook, @@ -12,8 +11,6 @@ buildPythonPackage rec { format = "setuptools"; pname = "ci-info"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 5e06ace61034..c87468bd5955 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, # propagates click, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "click-completion"; version = "0.5.2"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix index 283633f6d04f..89795e6001ca 100644 --- a/pkgs/development/python-modules/coapthon3/default.nix +++ b/pkgs/development/python-modules/coapthon3/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, cachetools, fetchFromGitHub, - isPy27, lib, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "coapthon3"; version = "1.0.2"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "Tanganelli"; diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix index ba8a49c20034..25d37cc566f1 100644 --- a/pkgs/development/python-modules/debts/default.nix +++ b/pkgs/development/python-modules/debts/default.nix @@ -3,7 +3,6 @@ python, buildPythonPackage, fetchFromGitLab, - isPy27, jinja2, pytest, }: @@ -22,8 +21,6 @@ buildPythonPackage rec { sha256 = "1d66nka81mv9c07mki78lp5hdajqv4cq6aq2k7bh3mhkc5hwnwlg"; }; - disabled = isPy27; - propagatedBuildInputs = [ jinja2 ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index 0d659cf4833c..e128ab588b06 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, pyserial, srp, lib, @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "digi-xbee"; version = "1.5.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { pname = "digi_xbee"; diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index e1310b1ef37d..c5ce2cd1685e 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, appdirs, asn1crypto, cffi, @@ -29,7 +28,6 @@ buildPythonPackage rec { pname = "etesync"; version = "0.12.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 0b1b0bf32747..7ee213a87409 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, setuptools, pytestCheckHook, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; extension = "zip"; diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 6a93631fe79b..685b9ffa6b81 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - isPy27, pythonAtLeast, coloredlogs, humanfriendly, @@ -21,7 +20,7 @@ buildPythonPackage rec { format = "setuptools"; # pipes is removed in python 3.13 - disabled = isPy27 || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "xolox"; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index e30677548552..9b432d32c042 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "gibberish-detector"; version = "0.1.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "domanchi"; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index f478acffb27e..765793f90ea4 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -10,13 +10,11 @@ libndtypes, libxnd, libgumath, - isPy27, }: buildPythonPackage { pname = "gumath"; format = "setuptools"; - disabled = isPy27; inherit (libgumath) src version meta; patches = [ diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix index 094331f54f75..9750b7686691 100644 --- a/pkgs/development/python-modules/halo/default.nix +++ b/pkgs/development/python-modules/halo/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, colorama, fetchPypi, - isPy27, lib, log-symbols, six, @@ -14,7 +13,6 @@ buildPythonPackage (finalAttrs: { pname = "halo"; version = "0.0.31"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 05f774c3dc43..3bfd9a6e2ca6 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - isPy27, idna, - typing ? null, }: buildPythonPackage rec { @@ -17,7 +15,7 @@ buildPythonPackage rec { sha256 = "0sx50lkivsfjxx9zr4yh7l9gll2l9kvl0v0w8w4wk2x5v9bzjyj2"; }; - propagatedBuildInputs = [ idna ] ++ lib.optionals isPy27 [ typing ]; + propagatedBuildInputs = [ idna ]; meta = { description = "Featureful, correct URL for Python"; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index ed8cc71addac..a4b0b46ffb4a 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - isPy27, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "inflection"; version = "0.5.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 80539b22e3e0..68a1e2967d8a 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, nbval, jupyter-packaging, @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "4.3.5"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-OU8kiVdlh8/XVTd6CaBn9GytIggZZQkgIf0avL54Uqg="; diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 01f4514eafb5..1e1eb826b7d7 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools-scm, more-itertools, pytestCheckHook, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "3.4.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.classes"; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 72696d60e7a2..52d42233e8b1 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, lib, numpy, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "javaobj-py3"; version = "0.4.4"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/json-rpc/default.nix b/pkgs/development/python-modules/json-rpc/default.nix index 10e4ae35245f..477c48b91abb 100644 --- a/pkgs/development/python-modules/json-rpc/default.nix +++ b/pkgs/development/python-modules/json-rpc/default.nix @@ -1,15 +1,10 @@ { lib, - isPy27, buildPythonPackage, fetchPypi, pytestCheckHook, - mock, }: -let - pythonEnv = lib.optional isPy27 mock; -in buildPythonPackage rec { pname = "json-rpc"; version = "1.15.0"; @@ -20,9 +15,7 @@ buildPythonPackage rec { hash = "sha256-5kQdVsHc1UJByTfQotzRk73wvcU5tTFlJHE/VUt/hbk="; }; - nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ]; - - nativeBuildInputs = pythonEnv; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "JSON-RPC 1/2 transport implementation"; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 6fcb892bd977..fd66f5dab78c 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -4,7 +4,6 @@ fetchPypi, fetchpatch, python, - isPy27, six, zope-testing, }: @@ -13,7 +12,6 @@ buildPythonPackage rec { pname = "manuel"; version = "1.13.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index b66bfccc410e..83a82ef0251a 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -8,14 +8,12 @@ pytestCheckHook, hypothesis, setuptools-scm, - isPy27, }: buildPythonPackage rec { pname = "matchpy"; version = "0.5.5"; # Don't upgrade to 4.3.1, this tag is very old format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "HPAC"; diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index eeb055381880..6854d80dc3c9 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "mergedeep"; version = "1.3.4"; format = "setuptools"; - disabled = isPy27; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 0ec60de6f4d8..21431e8a373e 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,6 +1,5 @@ { lib, - isPy27, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -14,7 +13,6 @@ buildPythonPackage rec { pname = "mlrose"; version = "1.3.0"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "gkhayes"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 8b0cf517676d..886238be38e4 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools, pytestCheckHook, scipy, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.24.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "rasbt"; repo = "mlxtend"; diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 23cb82eaf307..ff90bccc086c 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -1,9 +1,7 @@ { buildPythonPackage, fetchFromGitHub, - isPy27, lib, - mock, numpy, pytestCheckHook, }: @@ -20,7 +18,7 @@ buildPythonPackage rec { sha256 = "17r37pbxiv5dw857bmg990x836gq6sgww069w3q5jjg9m3xdm7dh"; }; - propagatedBuildInputs = [ numpy ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 0c7e59f6a6fa..a4392d767292 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pymongo, - isPy27, six, blinker, pytestCheckHook, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "mongoengine"; version = "0.29.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; diff --git a/pkgs/development/python-modules/mongoquery/default.nix b/pkgs/development/python-modules/mongoquery/default.nix index 01a1985031df..ae4a0cfc88d5 100644 --- a/pkgs/development/python-modules/mongoquery/default.nix +++ b/pkgs/development/python-modules/mongoquery/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, six, - isPy27, }: buildPythonPackage rec { @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.4.3"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; sha256 = "sha256-6QH4buWvfvbtovLCb0vSz+g4DYHxeLfjYH27zc7pcjk="; diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix index 840a1a7a2285..a77a245a2f01 100644 --- a/pkgs/development/python-modules/ms-cv/default.nix +++ b/pkgs/development/python-modules/ms-cv/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "0.1.1"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "OpenXbox"; repo = "ms_cv"; diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 21b13ffee682..95419e06d9b6 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -5,13 +5,11 @@ python, numpy, libndtypes, - isPy27, }: buildPythonPackage { pname = "ndtypes"; format = "setuptools"; - disabled = isPy27; inherit (libndtypes) version src meta; outputs = [ diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 103286a0f0b1..0b6c2aad4d88 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -5,14 +5,12 @@ jinja2, setuptools, rope, - isPy27, }: buildPythonPackage rec { pname = "nixpkgs-pytools"; version = "1.3.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index 5f4bdc99f89d..5cbb845e9e74 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, flake8, flask-sqlalchemy, - isPy27, mock, peewee, pytest-django, @@ -21,7 +20,6 @@ buildPythonPackage rec { pname = "nplusone"; version = "1.0.0"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "jmcarp"; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index b7a02b04a9d8..f2f0d8c973bc 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - isPy27, libopus, pytestCheckHook, lib, @@ -16,8 +15,6 @@ buildPythonPackage { version = "3.0.3"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "orion-labs"; repo = "opuslib"; diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index 720433461cf1..cefec10cb7f4 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "2.0.3"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "piccata"; diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix index aba650e2cbef..9831ba3b8140 100644 --- a/pkgs/development/python-modules/plexauth/default.nix +++ b/pkgs/development/python-modules/plexauth/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchFromGitHub, aiohttp, - isPy27, }: buildPythonPackage rec { pname = "plexauth"; version = "0.0.6"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "jjlawren"; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3275848c97da..ebd4220c69a3 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, setuptools, setuptools-scm, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "1.8.2"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-dlYfDeaKAdpN9q846ZVcTJ0aXJDac/fkAnalco7IPRA="; diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 63f4fc43c848..e6a3ee02086d 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage rec { pname = "pq"; version = "1.9.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 45e69dd12445..2b3290c32b94 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -4,7 +4,6 @@ click, fetchPypi, flask, - isPy27, nixosTests, prometheus-client, py-air-control, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "py-air-control-exporter"; version = "0.3.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix index 322454a2f59d..d1689fcc7c08 100644 --- a/pkgs/development/python-modules/py-sonic/default.nix +++ b/pkgs/development/python-modules/py-sonic/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage rec { pname = "py-sonic"; version = "1.0.3"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyaehw4a1/default.nix b/pkgs/development/python-modules/pyaehw4a1/default.nix index ab7dc9d4b854..b10e845296c4 100644 --- a/pkgs/development/python-modules/pyaehw4a1/default.nix +++ b/pkgs/development/python-modules/pyaehw4a1/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "0.3.9"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "bannhead"; repo = "pyaehw4a1"; diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index 80a3fefcb45c..e3ef26bd7c20 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, cffi, pytest, }: @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "pycmarkgfm"; version = "1.2.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 3ca3b126b8f3..4c0ac8884e18 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - isPy27, fetchPypi, enchant_2, }: @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "pyenchant"; version = "3.3.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pypubsub/default.nix b/pkgs/development/python-modules/pypubsub/default.nix index 3b4f97f73a61..b37b97e135fa 100644 --- a/pkgs/development/python-modules/pypubsub/default.nix +++ b/pkgs/development/python-modules/pypubsub/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage { pname = "pypubsub"; version = "4.0.3"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "schollii"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 85cedbede6af..89f5cc650dca 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, setuptools, - isPy27, fetchPypi, pkg-config, dbus, @@ -30,8 +29,6 @@ buildPythonPackage rec { version = "5.15.10"; pyproject = true; - disabled = isPy27; - src = fetchPypi { pname = "PyQt5"; inherit version; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 5de6872ce99e..f9b58f18bad5 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - isPy27, lib, setuptools, setuptools-declarative-requirements, @@ -13,7 +12,6 @@ buildPythonPackage rec { pname = "pytest-helpers-namespace"; version = "2021.12.29"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index f66343a8823b..12d82c4ee36c 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytest, tornado, }: @@ -11,7 +10,6 @@ buildPythonPackage { pname = "pytest-tornasync"; version = "0.6.0.post2"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "eukaryote"; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 47f40cab27e0..f656f3dfa416 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - isPy27, }: buildPythonPackage { pname = "pyxl3"; version = "1.4"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "gvanrossum"; diff --git a/pkgs/development/python-modules/reparser/default.nix b/pkgs/development/python-modules/reparser/default.nix index 5d35bc128083..b1749ded00e6 100644 --- a/pkgs/development/python-modules/reparser/default.nix +++ b/pkgs/development/python-modules/reparser/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "1.4.3"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "xmikos"; repo = "reparser"; diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index 5baae3a107e8..cd560fd2cca9 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -5,14 +5,12 @@ requests, pytest, flask, - isPy27, }: buildPythonPackage rec { version = "4.1"; format = "setuptools"; pname = "roku"; - disabled = isPy27; src = fetchFromGitHub { owner = "jcarbaugh"; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index d2a83c7260ec..05a38a1ca7f3 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, buildPythonPackage, - isPy27, setuptools, cython, portaudio, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "rtmixer"; version = "0.1.7"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "spatialaudio"; diff --git a/pkgs/development/python-modules/sansio-multipart/default.nix b/pkgs/development/python-modules/sansio-multipart/default.nix index ef47ab77c7ed..aa12f71a01e7 100644 --- a/pkgs/development/python-modules/sansio-multipart/default.nix +++ b/pkgs/development/python-modules/sansio-multipart/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, }: @@ -9,8 +8,6 @@ buildPythonPackage rec { pname = "sansio-multipart"; version = "0.3"; - disabled = isPy27; - format = "setuptools"; src = fetchPypi { diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index aa36b958343c..f6a2cc54fcbf 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -15,14 +15,12 @@ kmapper, tadasets, pytest, - isPy27, }: buildPythonPackage rec { pname = "scikit-tda"; version = "1.1.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "scikit-tda"; diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 63968d773aee..60e3c961d0db 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools, regex, csvw, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "segments"; version = "2.4.0"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index 3d488ca98eb0..d15858c59f03 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.0.0"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-eGj7HIv6dkwaxWPTzzacOB0TJdNhJJM6cm8p/NqoEuk="; diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 1518b29537ae..d0aa31dadddd 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -2,7 +2,6 @@ alsa-lib, buildPythonPackage, fetchFromGitHub, - isPy27, lib, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "simpleaudio"; version = "1.0.4"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "hamiltron"; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index c85eb0c4ad81..d042bbde7d4f 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - isPy27, fetchPypi, setuptools, setuptools-scm, @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "4.1.1"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-BtB1CniEsR4OjiDOC8fG1O1fF0PUVmlTQNE/3/lQAaY="; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index fa0168b0337c..c7d4995fc1cc 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, callPackage, fetchPypi, - isPy27, pythonOlder, lib, cryptography, @@ -11,7 +10,6 @@ grpcio-tools, hadoop, pytestCheckHook, - python, setuptools, versioneer, }: @@ -77,8 +75,5 @@ buildPythonPackage rec { alexbiehl illustris ]; - problems = lib.optionalAttrs isPy27 { - broken.message = "${pname} not supported on ${python.executable}"; - }; }; } diff --git a/pkgs/development/python-modules/snapshot-restore-py/default.nix b/pkgs/development/python-modules/snapshot-restore-py/default.nix index bb478bc8d11c..be8456cc2d58 100644 --- a/pkgs/development/python-modules/snapshot-restore-py/default.nix +++ b/pkgs/development/python-modules/snapshot-restore-py/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, setuptools, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "aws"; repo = "snapshot-restore-py"; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 4a7e62dee817..3f3fdb55ad07 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - isPy27, setuptools, cffi, numpy, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "sounddevice"; version = "0.5.3"; pyproject = true; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index aba070269087..591091073f8b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index da92f50fbfb8..8a5a6b9fdbc9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, deepmerge, fetchPypi, - isPy27, setuptools-scm, jsonschema, picobox, @@ -16,7 +15,6 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; version = "0.8.4"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spiderpy/default.nix b/pkgs/development/python-modules/spiderpy/default.nix index 5f247cca2cdc..d62ea82b6759 100644 --- a/pkgs/development/python-modules/spiderpy/default.nix +++ b/pkgs/development/python-modules/spiderpy/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, poetry-core, requests, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "1.7.2"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "peternijssen"; repo = "spiderpy"; diff --git a/pkgs/development/python-modules/spinners/default.nix b/pkgs/development/python-modules/spinners/default.nix index 049894a49bb0..5b9df19c1368 100644 --- a/pkgs/development/python-modules/spinners/default.nix +++ b/pkgs/development/python-modules/spinners/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, lib, }: @@ -9,7 +8,6 @@ buildPythonPackage rec { pname = "spinners"; version = "0.0.24"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index a7c90aa2c73e..977b78e0080d 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, future, imageio, @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "0.628"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "williamFalcon"; repo = "test-tube"; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 0133e47553c0..4dcf73be19fe 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, lib, fetchFromGitHub, - isPy27, setuptools, pytestCheckHook, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "6.2.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "asottile"; repo = "tokenize-rt"; diff --git a/pkgs/development/python-modules/update-checker/default.nix b/pkgs/development/python-modules/update-checker/default.nix index 54dc1c552357..f6100125a88a 100644 --- a/pkgs/development/python-modules/update-checker/default.nix +++ b/pkgs/development/python-modules/update-checker/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchPypi, requests, - isPy27, }: buildPythonPackage rec { pname = "update-checker"; version = "0.18.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { pname = "update_checker"; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 6b9a45b06fc0..5d60eff54efc 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, pytest-cov-stub, setuptools, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "3.1.1"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-U0+zs1VmkoPrOVRYGTHl0dBx/OYdAp1Y8yGaXjpvDEE="; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8b09738955a..2fe8b765a2a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8985,7 +8985,6 @@ self: super: with self; { p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; - broken = super.meta.broken or isPy27; }; }) )