Merge pull request #246829 from tjni/d2to1-cleanup
python3.pkgs.d2to1: remove as it's archived and breaks with setuptools 68
This commit is contained in:
commit
954b6397ae
|
@ -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, ...)";
|
||||
|
|
|
@ -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', ]})
|
|
@ -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 ];
|
||||
};
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -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 { };
|
||||
|
|
Loading…
Reference in a new issue