From 485bbe58365f3c44a42f87b8cec2385b88380d74 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 30 Jul 2023 10:25:23 -0700 Subject: [PATCH 1/2] python3.pkgs.colour: remove d2to1 to support setuptools 68 --- .../python-modules/colour/default.nix | 27 +++++++- .../colour/remove-unmaintained-d2to1.diff | 65 +++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index f7419666f5359..2dd31a02bbe77 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -1,15 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, d2to1 }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "colour"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "af20120fefd2afede8b001fbef2ea9da70ad7d49fafdb6489025dae8745c3aee"; + hash = "sha256-ryASD+/Sr+3osAH77y6p2nCtfUn6/bZIkCXa6HRcOu4="; }; - buildInputs = [ d2to1 ]; + patches = [ + # https://github.com/vaab/colour/pull/66 (but does not merge cleanly) + ./remove-unmaintained-d2to1.diff + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "--doctest-glob=\"*.rst\"" + "--doctest-modules" + ]; + + pythonImportsCheck = [ + "colour" + ]; meta = with lib; { description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; diff --git a/pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff b/pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff new file mode 100644 index 0000000000000..2cac787bf501b --- /dev/null +++ b/pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff @@ -0,0 +1,65 @@ +diff --git a/setup.cfg b/setup.cfg +index 41de928..1c18182 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,18 +1,14 @@ + [metadata] + name = colour + version = 0.1.5 +-summary = converts and manipulates various color representation (HSL, RVB, web, X11, ...) +-description-file = +- README.rst +- CHANGELOG.rst +- TODO.rst +-license_file = LICENSE +-requires-dist = ++description = converts and manipulates various color representation (HSL, RVB, web, X11, ...) ++long_description = file: README.rst, CHANGELOG.rst, TODO.rst ++license_files = LICENSE + author = Valentin LAB + author_email = valentin.lab@kalysto.org +-home_page = http://github.com/vaab/colour ++url = http://github.com/vaab/colour + license = BSD 3-Clause License +-classifier = ++classifiers = + Programming Language :: Python + Topic :: Software Development :: Libraries :: Python Modules + Development Status :: 3 - Alpha +@@ -26,16 +22,8 @@ classifier = + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + +-[files] +-modules = colour +-extra_files = +- README.rst +- CHANGELOG.rst +- TODO.rst +- setup.py +- +-[backwards_compat] +-zip-safe = False ++[options] ++zip_safe = False + + [bdist_wheel] + universal = 1 +diff --git a/setup.py b/setup.py +index 47038f9..11a8d3a 100644 +--- a/setup.py ++++ b/setup.py +@@ -54,12 +54,4 @@ if "%%short-version%%".startswith("%%"): + sys.exit(errlvl) + + +-## +-## Normal d2to1 setup +-## +- +-setup( +- setup_requires=['d2to1'], +- extras_require={'test': ['nose', ]}, +- d2to1=True +-) ++setup(extras_require={'test': ['nose', ]}) From afb1afc55ef92f81c1b1a2f10fc3fe6bfa1b9129 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 2 Aug 2023 10:54:28 -0700 Subject: [PATCH 2/2] python3.pkgs.d2to1: remove as it's archived and breaks with setuptools 68 --- .../python-modules/d2to1/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/d2to1/default.nix diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix deleted file mode 100644 index eaad9fc9095bd..0000000000000 --- a/pkgs/development/python-modules/d2to1/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildPythonPackage -, lib -, fetchFromGitHub -, nose -}: -buildPythonPackage rec { - pname = "d2to1"; - version = "0.2.12.post1"; - - nativeCheckInputs = [ nose ]; - - src = fetchFromGitHub { - owner = "embray"; - repo = pname; - rev = version; - sha256 = "1hzq51qbzsc27yy8swp08kf42mamag7qcabbrigzj4m6ivb5chi2"; - }; - - meta = with lib;{ - description = "Support for distutils2-like setup.cfg files as package metadata"; - homepage = "https://github.com/embray/d2to1"; - license = licenses.bsd2; - maintainers = with maintainers; [ makefu ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9a2fc35869093..70e4855f79399 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -80,6 +80,7 @@ mapAliases ({ cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 cx_Freeze = cx-freeze; # added 2023-08-02 + d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dateutil = python-dateutil; # added 2021-07-03 demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62262f5202891..425082dce9508 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2365,8 +2365,6 @@ self: super: with self; { cytoolz = callPackage ../development/python-modules/cytoolz { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; - dacite = callPackage ../development/python-modules/dacite { }; daemonize = callPackage ../development/python-modules/daemonize { };