From bd927cd4c288233119c8f514b5e8eb862cc69e89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 22:22:26 +0200 Subject: [PATCH 1/5] python312Packages.dyn: refactor --- .../python-modules/dyn/default.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index c391250d9517..7184f602504c 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,33 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock -, pytest-xdist, cov-core, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "dyn"; version = "1.8.6"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA="; + hash = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA="; }; - buildInputs = [ glibcLocales ]; - - nativeCheckInputs = [ - pytest - pytest-cov - mock - pytest-xdist - cov-core + build-system = [ + setuptools ]; - # Disable checks because they are not stateless and require internet access. + + # Module has no tests doCheck = false; - LC_ALL="en_US.UTF-8"; + pythonImportsCheck = [ + "dyn" + ]; meta = with lib; { description = "Dynect dns lib"; - homepage = "https://dyn.readthedocs.org/en/latest/intro.html"; + homepage = "https://dyn.readthedocs.org"; + changelog = "https://github.com/dyninc/dyn-python/blob/${version}/HISTORY.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From cf87d9f9b07843c67058fe0751642c732156e612 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 22:22:44 +0200 Subject: [PATCH 2/5] python312Packages.dyn: format with nixfmt --- .../python-modules/dyn/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 7184f602504c..f16d9d4d55d7 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -17,16 +18,12 @@ buildPythonPackage rec { hash = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "dyn" - ]; + pythonImportsCheck = [ "dyn" ]; meta = with lib; { description = "Dynect dns lib"; From 2738a78e19ef5f5f5abc8d4b5d7882821bdc263a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 22:31:32 +0200 Subject: [PATCH 3/5] python312Packages.cov-core: remove It was archived and unmaintained since 2014 --- .../python-modules/cov-core/default.nix | 18 ------------------ pkgs/top-level/python-aliases.nix | 3 ++- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/python-modules/cov-core/default.nix diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix deleted file mode 100644 index 6a4610fc447c..000000000000 --- a/pkgs/development/python-modules/cov-core/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, coverage }: - -buildPythonPackage rec { - pname = "cov-core"; - version = "1.15.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a"; - }; - - propagatedBuildInputs = [ coverage ]; - - meta = with lib; { - description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9e82a642cdff..693c4512c0eb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -93,7 +93,8 @@ mapAliases ({ CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 - covCore = cov-core; # added 2024-01-03 + covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20 + cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 967317d22bbd..12e32abc82f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2494,8 +2494,6 @@ self: super: with self; { courlan = callPackage ../development/python-modules/courlan { }; - cov-core = callPackage ../development/python-modules/cov-core { }; - coverage = callPackage ../development/python-modules/coverage { }; coveralls = callPackage ../development/python-modules/coveralls { }; From 33916ed7b1fd0cee9080bc8b8928ee2055752be1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 22:34:47 +0200 Subject: [PATCH 4/5] python312Packages.pylti: remove pylti has been removed because it is unmaintained since 2019 --- .../python-modules/pylti/default.nix | 53 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/development/python-modules/pylti/default.nix diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix deleted file mode 100644 index a4f4abcb7304..000000000000 --- a/pkgs/development/python-modules/pylti/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, httplib2 -, oauth -, oauth2 -, semantic-version -, flask -, httpretty -, oauthlib -, pyflakes -, pytest -, pytestcache -, pytest-cov -, cov-core -, pytest-flakes -, sphinx -, mock -, chalice -, isPy27 -}: - -buildPythonPackage rec { - pname = "pylti"; - version = "0.7.0"; - format = "setuptools"; - - disabled = !isPy27; - - # There is no need to fix mock. https://github.com/mitodl/pylti/pull/48 - postPatch = '' - substituteInPlace setup.py --replace "mock==1.0.1" "mock" - ''; - - propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; - nativeCheckInputs = [ - flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov cov-core - pytest-flakes sphinx mock chalice - ]; - - src = fetchPypi { - pname = "PyLTI"; - inherit version; - sha256 = "80938a235b1ab390f6889a95237d087ea7adde5cc50fcae9c80c49898e8ee78e"; - }; - - meta = { - description = "Implementation of IMS LTI interface that works with edX"; - homepage = "https://github.com/mitodl/pylti"; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ layus ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 693c4512c0eb..a777dfb59707 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -363,6 +363,7 @@ mapAliases ({ pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 + pylti = throw "pylti has been removed because it is unmaintained since 2019"; # added 2024-05-21 pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12e32abc82f8..27068a3122c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11291,8 +11291,6 @@ self: super: with self; { pylpsd = callPackage ../development/python-modules/pylpsd { }; - pylti = callPackage ../development/python-modules/pylti { }; - pylutron = callPackage ../development/python-modules/pylutron { }; pylutron-caseta = callPackage ../development/python-modules/pylutron-caseta { }; From 3ec13e8d507c0787cb3079f1ad6e4a11e0354f0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 23:04:59 +0200 Subject: [PATCH 5/5] python312Packages.nose-cov: remove It was archived and unmaintained since 2012 --- .../python-modules/nose-cov/default.nix | 21 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/development/python-modules/nose-cov/default.nix diff --git a/pkgs/development/python-modules/nose-cov/default.nix b/pkgs/development/python-modules/nose-cov/default.nix deleted file mode 100644 index 8bb314f116f0..000000000000 --- a/pkgs/development/python-modules/nose-cov/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, nose, cov-core }: - -buildPythonPackage rec { - pname = "nose-cov"; - version = "1.6"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "04j4fw01bv648gimqqj4z88606lcczbm1k326agcc74gb4sh7v4b"; - }; - - propagatedBuildInputs = [ nose cov-core ]; - - meta = with lib; { - homepage = "https://pypi.org/project/nose-cov/"; - license = licenses.mit; - description = "This plugin produces coverage reports. It also supports coverage of subprocesses."; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a777dfb59707..caf1e8fbc970 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -304,6 +304,7 @@ mapAliases ({ nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 ninja-python = ninja; # add 2022-08-03 nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21 + nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27068a3122c5..fc1158d04dff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8859,8 +8859,6 @@ self: super: with self; { nose3 = callPackage ../development/python-modules/nose3 { }; - nose-cov = callPackage ../development/python-modules/nose-cov { }; - nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose-timer = callPackage ../development/python-modules/nose-timer { };