core: added patches to support latest problems with setuptools scm.

This commit is contained in:
Milka Kuzminski 2021-03-23 14:53:22 +01:00
parent c0508d2945
commit 89ee31e1c2
6 changed files with 87 additions and 1 deletions

View file

@ -0,0 +1,10 @@
diff -rup configparser-4.0.2-orig/pyproject.toml configparser-4.0.2/pyproject.toml
--- configparser-4.0.2-orig/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
+++ configparser-4.0.2/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
@@ -1,5 +1,5 @@
[build-system]
-requires = ["setuptools>=40.7", "wheel", "setuptools_scm>=1.15"]
+requires = ["setuptools<=42.0", "wheel", "setuptools_scm<6.0.0"]
build-backend = "setuptools.build_meta"
[tool.black]

View file

@ -0,0 +1,7 @@
diff -rup importlib-metadata-1.6.0-orig/yproject.toml importlib-metadata-1.6.0/pyproject.toml
--- importlib-metadata-1.6.0-orig/yproject.toml 2021-03-22 22:10:33.000000000 +0100
+++ importlib-metadata-1.6.0/pyproject.toml 2021-03-22 22:11:09.000000000 +0100
@@ -1,3 +1,3 @@
[build-system]
-requires = ["setuptools>=30.3", "wheel", "setuptools_scm"]
+requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]

View file

@ -6,7 +6,7 @@ diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py
setup(
use_scm_version={"write_to": "src/_pytest/_version.py"},
- setup_requires=["setuptools-scm", "setuptools>=40.0"],
+ setup_requires=["setuptools-scm", "setuptools<=42.0"],
+ setup_requires=["setuptools-scm<6.0.0", "setuptools<=42.0"],
package_dir={"": "src"},
# fmt: off
extras_require={

View file

@ -0,0 +1,10 @@
diff -rup zip-1.2.0-orig/pyproject.toml zip-1.2.0/pyproject.toml
--- zip-1.2.0-orig/pyproject.toml 2021-03-23 10:55:37.000000000 +0100
+++ zip-1.2.0/pyproject.toml 2021-03-23 10:56:05.000000000 +0100
@@ -1,5 +1,5 @@
[build-system]
-requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
+requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]
build-backend = "setuptools.build_meta"
[tool.black]

View file

@ -280,6 +280,54 @@ self: super: {
];
});
"pytest-runner" = super."pytest-runner".override (attrs: {
propagatedBuildInputs = [
self."setuptools-scm"
];
});
"py" = super."py".override (attrs: {
propagatedBuildInputs = [
self."setuptools-scm"
];
});
"python-dateutil" = super."python-dateutil".override (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
self."setuptools-scm"
];
});
"configparser" = super."configparser".override (attrs: {
patches = [
./patches/configparser/pyproject.patch
];
propagatedBuildInputs = [
self."setuptools-scm"
];
});
"importlib-metadata" = super."importlib-metadata".override (attrs: {
patches = [
./patches/importlib_metadata/pyproject.patch
];
propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
self."setuptools-scm"
];
});
"zipp" = super."zipp".override (attrs: {
patches = [
./patches/zipp/pyproject.patch
];
propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
self."setuptools-scm"
];
});
"pyramid-apispec" = super."pyramid-apispec".override (attrs: {
patches = [
./patches/pyramid_apispec/setuptools.patch

View file

@ -2092,6 +2092,17 @@ self: super: {
license = [ pkgs.lib.licenses.mit ];
};
};
"setuptools-scm" = super.buildPythonPackage {
name = "setuptools-scm-3.5.0";
doCheck = false;
src = fetchurl {
url = "https://files.pythonhosted.org/packages/b2/f7/60a645aae001a2e06cf4b8db2fba9d9f36b8fd378f10647e3e218b61b74b/setuptools_scm-3.5.0.tar.gz";
sha256 = "5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87";
};
meta = {
license = [ pkgs.lib.licenses.psfl ];
};
};
"simplegeneric" = super.buildPythonPackage {
name = "simplegeneric-0.8.1";
doCheck = false;