Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python3.pkgs.d2to1: remove as it's archived and breaks with setuptools 68 #246829

Merged
merged 2 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions pkgs/development/python-modules/colour/default.nix
Original file line number Diff line number Diff line change
@@ -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, ...)";
Expand Down
Original file line number Diff line number Diff line change
@@ -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 = [email protected]
-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', ]})
25 changes: 0 additions & 25 deletions pkgs/development/python-modules/d2to1/default.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down