##// END OF EJS Templates
build: fixed some problem after latest setuptools-scm relase. We now explicitly...
milka -
r929:d9012782 default
parent child
Show More
@@ -0,0 +1,10
1 diff -rup configparser-4.0.2-orig/pyproject.toml configparser-4.0.2/pyproject.toml
2 --- configparser-4.0.2-orig/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
3 +++ configparser-4.0.2/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
4 @@ -1,5 +1,5 @@
5 [build-system]
6 -requires = ["setuptools>=40.7", "wheel", "setuptools_scm>=1.15"]
7 +requires = ["setuptools<=42.0", "wheel", "setuptools_scm<6.0.0"]
8 build-backend = "setuptools.build_meta"
9
10 [tool.black]
@@ -0,0 +1,7
1 diff -rup importlib-metadata-1.6.0-orig/yproject.toml importlib-metadata-1.6.0/pyproject.toml
2 --- importlib-metadata-1.6.0-orig/yproject.toml 2021-03-22 22:10:33.000000000 +0100
3 +++ importlib-metadata-1.6.0/pyproject.toml 2021-03-22 22:11:09.000000000 +0100
4 @@ -1,3 +1,3 @@
5 [build-system]
6 -requires = ["setuptools>=30.3", "wheel", "setuptools_scm"]
7 +requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]
@@ -21,9 +21,15 self: super: {
21 ];
21 ];
22 });
22 });
23
23
24 "ipython" = super."ipython".override (attrs: {
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
26 self."setuptools-scm"
27 ];
28 });
29
24 "gevent" = super."gevent".override (attrs: {
30 "gevent" = super."gevent".override (attrs: {
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
31 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
26 # NOTE: (marcink) odd requirements from gevent aren't set properly,
32 # NOTE: (marcink) odd requirements from gevent aren not set properly,
27 # thus we need to inject psutil manually
33 # thus we need to inject psutil manually
28 self."psutil"
34 self."psutil"
29 ];
35 ];
@@ -71,6 +77,45 self: super: {
71 ];
77 ];
72 });
78 });
73
79
80 "pytest-runner" = super."pytest-runner".override (attrs: {
81 propagatedBuildInputs = [
82 self."setuptools-scm"
83 ];
84 });
85
86 "py" = super."py".override (attrs: {
87 propagatedBuildInputs = [
88 self."setuptools-scm"
89 ];
90 });
91
92 "configparser" = super."configparser".override (attrs: {
93 patches = [
94 ./patches/configparser/pyproject.patch
95 ];
96 propagatedBuildInputs = [
97 self."setuptools-scm"
98 ];
99 });
100
101 "importlib-metadata" = super."importlib-metadata".override (attrs: {
102
103 patches = [
104 ./patches/importlib_metadata/pyproject.patch
105 ];
106
107 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
108 self."setuptools-scm"
109 ];
110
111 "zipp" = super."zipp".override (attrs: {
112 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
113 self."setuptools-scm"
114 ];
115 });
116
117 });
118
74 # Avoid that base packages screw up the build process
119 # Avoid that base packages screw up the build process
75 inherit (basePythonPackages)
120 inherit (basePythonPackages)
76 setuptools;
121 setuptools;
@@ -886,6 +886,19 self: super: {
886 license = [ pkgs.lib.licenses.mit ];
886 license = [ pkgs.lib.licenses.mit ];
887 };
887 };
888 };
888 };
889
890 "setuptools-scm" = super.buildPythonPackage {
891 name = "setuptools-scm-3.5.0";
892 doCheck = false;
893 src = fetchurl {
894 url = "https://files.pythonhosted.org/packages/b2/f7/60a645aae001a2e06cf4b8db2fba9d9f36b8fd378f10647e3e218b61b74b/setuptools_scm-3.5.0.tar.gz";
895 sha256 = "5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87";
896 };
897 meta = {
898 license = [ pkgs.lib.licenses.psfl ];
899 };
900 };
901
889 "simplegeneric" = super.buildPythonPackage {
902 "simplegeneric" = super.buildPythonPackage {
890 name = "simplegeneric-0.8.1";
903 name = "simplegeneric-0.8.1";
891 doCheck = false;
904 doCheck = false;
General Comments 0
You need to be logged in to leave comments. Login now