py-pip: add 23.1.2 (#38608)
* py-pip: add 23.1.2 * Restrict py-pip version for py-protobuf * Restrict py-pip version for straightforward packages * Restrict py-pip version for nrm * Fix --install-option name in comments * Simplify py-pip restriction for py-scs * nrm: fix wrong comment
This commit is contained in:
		| @@ -14,6 +14,9 @@ class Nrm(PythonPackage): | |||||||
|     version("0.1.0", sha256="911a848042fa50ed216c818e0667bcd3e4219687eb5a35476b7313abe12106dc") |     version("0.1.0", sha256="911a848042fa50ed216c818e0667bcd3e4219687eb5a35476b7313abe12106dc") | ||||||
| 
 | 
 | ||||||
|     depends_on("py-setuptools", type=("build")) |     depends_on("py-setuptools", type=("build")) | ||||||
|  |     # using py-pip@23.1 results in | ||||||
|  |     # ValueError: ZIP does not support timestamps before 1980 | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
| 
 | 
 | ||||||
|     depends_on("py-six", type=("build", "run")) |     depends_on("py-six", type=("build", "run")) | ||||||
|     depends_on("py-pyzmq@17.1.2", type=("build", "run")) |     depends_on("py-pyzmq@17.1.2", type=("build", "run")) | ||||||
|   | |||||||
| @@ -22,6 +22,9 @@ class PyBrian2(PythonPackage): | |||||||
|     depends_on("python@2.7:", type=("build", "run")) |     depends_on("python@2.7:", type=("build", "run")) | ||||||
|     depends_on("python@3.6:", type=("build", "run"), when="@2.4:") |     depends_on("python@3.6:", type=("build", "run"), when="@2.4:") | ||||||
|     depends_on("python@3.7:", type=("build", "run"), when="@2.5:") |     depends_on("python@3.7:", type=("build", "run"), when="@2.5:") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|  | 
 | ||||||
|     depends_on("py-numpy@1.10:", type=("build", "run")) |     depends_on("py-numpy@1.10:", type=("build", "run")) | ||||||
|     depends_on("py-numpy@1.15:", type=("build", "run"), when="@2.4:") |     depends_on("py-numpy@1.15:", type=("build", "run"), when="@2.4:") | ||||||
|     depends_on("py-numpy@1.17:", type=("build", "run"), when="@2.5:") |     depends_on("py-numpy@1.17:", type=("build", "run"), when="@2.5:") | ||||||
|   | |||||||
| @@ -22,6 +22,8 @@ class PyCmake(PythonPackage): | |||||||
|     depends_on("ninja", type="build") |     depends_on("ninja", type="build") | ||||||
|     depends_on("py-scikit-build@0.12:", type="build") |     depends_on("py-scikit-build@0.12:", type="build") | ||||||
|     depends_on("py-setuptools@42:", type="build") |     depends_on("py-setuptools@42:", type="build") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|     depends_on("git", type="build") |     depends_on("git", type="build") | ||||||
|     depends_on("cmake@3.22.2", type=("build", "link", "run"), when="@3.22.2") |     depends_on("cmake@3.22.2", type=("build", "link", "run"), when="@3.22.2") | ||||||
|     depends_on("cmake@3.21.4", type=("build", "link", "run"), when="@3.21.4") |     depends_on("cmake@3.21.4", type=("build", "link", "run"), when="@3.21.4") | ||||||
|   | |||||||
| @@ -18,6 +18,8 @@ class PyFastrlock(PythonPackage): | |||||||
| 
 | 
 | ||||||
|     depends_on("py-setuptools", type="build") |     depends_on("py-setuptools", type="build") | ||||||
|     depends_on("py-cython", type="build") |     depends_on("py-cython", type="build") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
| 
 | 
 | ||||||
|     def install_options(self, spec, prefix): |     def install_options(self, spec, prefix): | ||||||
|         return ["--with-cython"] |         return ["--with-cython"] | ||||||
|   | |||||||
| @@ -18,6 +18,8 @@ class PyLightgbm(PythonPackage): | |||||||
|     variant("mpi", default=False, description="Build with mpi support") |     variant("mpi", default=False, description="Build with mpi support") | ||||||
| 
 | 
 | ||||||
|     depends_on("py-setuptools", type="build") |     depends_on("py-setuptools", type="build") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", when="+mpi", type="build") | ||||||
|     depends_on("py-wheel", type=("build", "run")) |     depends_on("py-wheel", type=("build", "run")) | ||||||
|     depends_on("py-numpy", type=("build", "run")) |     depends_on("py-numpy", type=("build", "run")) | ||||||
|     depends_on("py-scipy", type=("build", "run")) |     depends_on("py-scipy", type=("build", "run")) | ||||||
|   | |||||||
| @@ -31,6 +31,8 @@ class PyMpi4py(PythonPackage): | |||||||
|     depends_on("python@2.6:2.7,3.2:") |     depends_on("python@2.6:2.7,3.2:") | ||||||
|     depends_on("python@2.7:2.8,3.5:", when="@3.1:") |     depends_on("python@2.7:2.8,3.5:", when="@3.1:") | ||||||
|     depends_on("py-setuptools@40.9:", type="build") |     depends_on("py-setuptools@40.9:", type="build") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|     depends_on("mpi") |     depends_on("mpi") | ||||||
|     depends_on("py-cython@0.27.0:", type="build") |     depends_on("py-cython@0.27.0:", type="build") | ||||||
| 
 | 
 | ||||||
|   | |||||||
| @@ -17,6 +17,11 @@ class PyPip(Package, PythonExtension): | |||||||
| 
 | 
 | ||||||
|     maintainers("adamjstewart", "pradyunsg") |     maintainers("adamjstewart", "pradyunsg") | ||||||
| 
 | 
 | ||||||
|  |     version( | ||||||
|  |         "23.1.2", | ||||||
|  |         sha256="3ef6ac33239e4027d9a5598a381b9d30880a1477e50039db2eac6e8a8f6d1b18", | ||||||
|  |         expand=False, | ||||||
|  |     ) | ||||||
|     version( |     version( | ||||||
|         "23.0", |         "23.0", | ||||||
|         sha256="b5f88adff801f5ef052bcdef3daa31b55eb67b0fccd6d0106c206fa248e0463c", |         sha256="b5f88adff801f5ef052bcdef3daa31b55eb67b0fccd6d0106c206fa248e0463c", | ||||||
| @@ -80,11 +85,6 @@ class PyPip(Package, PythonExtension): | |||||||
| 
 | 
 | ||||||
|     extends("python") |     extends("python") | ||||||
|     depends_on("python@3.7:", when="@22:", type=("build", "run")) |     depends_on("python@3.7:", when="@22:", type=("build", "run")) | ||||||
|     depends_on("python@3.6:", when="@21:", type=("build", "run")) |  | ||||||
|     depends_on("python@2.7:2.8,3.5:", when="@19.2:", type=("build", "run")) |  | ||||||
|     depends_on("python@2.7:2.8,3.4:", when="@18:", type=("build", "run")) |  | ||||||
|     depends_on("python@2.7:2.8,3.3:", when="@10:", type=("build", "run")) |  | ||||||
|     depends_on("python@2.6:2.8,3.3:", type=("build", "run")) |  | ||||||
| 
 | 
 | ||||||
|     def url_for_version(self, version): |     def url_for_version(self, version): | ||||||
|         url = "https://files.pythonhosted.org/packages/{0}/p/pip/pip-{1}-{0}-none-any.whl" |         url = "https://files.pythonhosted.org/packages/{0}/p/pip/pip-{1}-{0}-none-any.whl" | ||||||
|   | |||||||
| @@ -62,6 +62,8 @@ class PyProtobuf(PythonPackage): | |||||||
|     version("3.0.0", sha256="ecc40bc30f1183b418fe0ec0c90bc3b53fa1707c4205ee278c6b90479e5b6ff5") |     version("3.0.0", sha256="ecc40bc30f1183b418fe0ec0c90bc3b53fa1707c4205ee278c6b90479e5b6ff5") | ||||||
| 
 | 
 | ||||||
|     depends_on("py-setuptools", type=("build", "run")) |     depends_on("py-setuptools", type=("build", "run")) | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", when="@:4.21", type=("build", "run")) | ||||||
|     depends_on("py-six@1.9:", when="@3.0:3.17", type=("build", "run")) |     depends_on("py-six@1.9:", when="@3.0:3.17", type=("build", "run")) | ||||||
| 
 | 
 | ||||||
|     # Setup dependencies for protobuf to use the same minor version as py-protobuf |     # Setup dependencies for protobuf to use the same minor version as py-protobuf | ||||||
|   | |||||||
| @@ -42,6 +42,9 @@ class PyPyarrow(PythonPackage, CudaPackage): | |||||||
|     depends_on("py-cython", type="build") |     depends_on("py-cython", type="build") | ||||||
|     depends_on("py-cython@0.29:", type="build", when="@0.15.0:") |     depends_on("py-cython@0.29:", type="build", when="@0.15.0:") | ||||||
|     depends_on("py-cython@0.29.22:", type="build", when="@8.0.0:") |     depends_on("py-cython@0.29.22:", type="build", when="@8.0.0:") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|  | 
 | ||||||
|     depends_on("py-numpy@1.14:", type=("build", "run"), when="@0.15.0:") |     depends_on("py-numpy@1.14:", type=("build", "run"), when="@0.15.0:") | ||||||
|     depends_on("py-numpy@1.16.6:", type=("build", "run"), when="@3.0.0:") |     depends_on("py-numpy@1.16.6:", type=("build", "run"), when="@3.0.0:") | ||||||
| 
 | 
 | ||||||
|   | |||||||
| @@ -20,6 +20,8 @@ class PyQiskitAer(PythonPackage, CudaPackage): | |||||||
|     depends_on("python@3.6:", type=("build", "run"), when="@0.9.1") |     depends_on("python@3.6:", type=("build", "run"), when="@0.9.1") | ||||||
|     depends_on("python@3.7:", type=("build", "run"), when="@0.11.1") |     depends_on("python@3.7:", type=("build", "run"), when="@0.11.1") | ||||||
|     depends_on("py-setuptools@40.1.0:", type="build") |     depends_on("py-setuptools@40.1.0:", type="build") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|     depends_on("py-numpy@1.16.3:", type=("build", "run")) |     depends_on("py-numpy@1.16.3:", type=("build", "run")) | ||||||
|     depends_on("py-pybind11@2.6:", type="build") |     depends_on("py-pybind11@2.6:", type="build") | ||||||
|     depends_on("py-qiskit-terra@0.17.0:", type=("build", "run")) |     depends_on("py-qiskit-terra@0.17.0:", type=("build", "run")) | ||||||
|   | |||||||
| @@ -31,6 +31,10 @@ class PyScs(PythonPackage, CudaPackage): | |||||||
|     depends_on("py-numpy@1.7:", type=("build", "run")) |     depends_on("py-numpy@1.7:", type=("build", "run")) | ||||||
|     depends_on("py-scipy@0.13.2:", type=("build", "run")) |     depends_on("py-scipy@0.13.2:", type=("build", "run")) | ||||||
| 
 | 
 | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     # technically only the variants need this restriction | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|  | 
 | ||||||
|     def install_options(self, spec, prefix): |     def install_options(self, spec, prefix): | ||||||
|         args = [] |         args = [] | ||||||
|         if ( |         if ( | ||||||
|   | |||||||
| @@ -32,6 +32,8 @@ class PySymengine(PythonPackage): | |||||||
|     depends_on("py-setuptools@:60", type="build", when="@:0.9.2") |     depends_on("py-setuptools@:60", type="build", when="@:0.9.2") | ||||||
|     depends_on("py-cython@0.19.1:", type="build", when="@0.2.0") |     depends_on("py-cython@0.19.1:", type="build", when="@0.2.0") | ||||||
|     depends_on("py-cython@0.29.24:", type="build", when="@0.8.1:") |     depends_on("py-cython@0.29.24:", type="build", when="@0.8.1:") | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|     depends_on("cmake@2.8.12:", type="build") |     depends_on("cmake@2.8.12:", type="build") | ||||||
|     # see symengine_version.txt |     # see symengine_version.txt | ||||||
|     depends_on("symengine@0.2.0", when="@0.2.0") |     depends_on("symengine@0.2.0", when="@0.2.0") | ||||||
|   | |||||||
| @@ -36,6 +36,9 @@ class PyXgboost(PythonPackage): | |||||||
|     depends_on("python@3.7:", when="@1.6:", type=("build", "run")) |     depends_on("python@3.7:", when="@1.6:", type=("build", "run")) | ||||||
|     depends_on("python@3.6:", type=("build", "run")) |     depends_on("python@3.6:", type=("build", "run")) | ||||||
|     depends_on("py-setuptools", type=("build")) |     depends_on("py-setuptools", type=("build")) | ||||||
|  |     # in newer pip versions --install-option does not exist | ||||||
|  |     depends_on("py-pip@:23.0", type="build") | ||||||
|  | 
 | ||||||
|     depends_on("py-numpy", type=("build", "run")) |     depends_on("py-numpy", type=("build", "run")) | ||||||
|     depends_on("py-scipy", type=("build", "run")) |     depends_on("py-scipy", type=("build", "run")) | ||||||
| 
 | 
 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Manuela Kuhn
					Manuela Kuhn