summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2022-12-06 08:58:05 -0600
committerGitHub <noreply@github.com>2022-12-06 08:58:05 -0600
commit95b5d541291aae3b85a1582e2d0e39066ca4e17a (patch)
tree944301c42f4ca011aeafa8a1fe8becd3ff2c9a5f
parentbcce9c3e9c84745531f5a025ad04f162d98e5252 (diff)
downloadspack-95b5d541291aae3b85a1582e2d0e39066ca4e17a.tar.gz
spack-95b5d541291aae3b85a1582e2d0e39066ca4e17a.tar.bz2
spack-95b5d541291aae3b85a1582e2d0e39066ca4e17a.tar.xz
spack-95b5d541291aae3b85a1582e2d0e39066ca4e17a.zip
pip/wheel/setuptools: extend PythonExtension (#34137)
* pip/wheel/setuptools: extend PythonExtension * Base class still required
-rw-r--r--var/spack/repos/builtin/packages/py-pip/package.py8
-rw-r--r--var/spack/repos/builtin/packages/py-setuptools/package.py9
-rw-r--r--var/spack/repos/builtin/packages/py-wheel/package.py7
3 files changed, 3 insertions, 21 deletions
diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py
index 9c34b6b62b..7bd7949be4 100644
--- a/var/spack/repos/builtin/packages/py-pip/package.py
+++ b/var/spack/repos/builtin/packages/py-pip/package.py
@@ -8,7 +8,7 @@ import os
from spack.package import *
-class PyPip(Package):
+class PyPip(Package, PythonExtension):
"""The PyPA recommended tool for installing Python packages."""
homepage = "https://pip.pypa.io/"
@@ -74,12 +74,6 @@ class PyPip(Package):
)
extends("python")
- 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):
url = "https://files.pythonhosted.org/packages/{0}/p/pip/pip-{1}-{0}-none-any.whl"
diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py
index 6bb59b2ad6..e4b292f738 100644
--- a/var/spack/repos/builtin/packages/py-setuptools/package.py
+++ b/var/spack/repos/builtin/packages/py-setuptools/package.py
@@ -6,7 +6,7 @@
from spack.package import *
-class PySetuptools(Package):
+class PySetuptools(Package, PythonExtension):
"""A Python utility that aids in the process of downloading, building,
upgrading, installing, and uninstalling Python packages."""
@@ -14,8 +14,6 @@ class PySetuptools(Package):
url = "https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-62.3.2-py3-none-any.whl"
list_url = "https://pypi.org/simple/setuptools/"
- maintainers = ["adamjstewart"]
-
version(
"65.5.0",
sha256="f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356",
@@ -178,11 +176,6 @@ class PySetuptools(Package):
)
extends("python")
- depends_on("python@3.7:", when="@59.7:", type=("build", "run"))
- depends_on("python@3.6:", when="@51:", type=("build", "run"))
- depends_on("python@3.5:", when="@45:50", type=("build", "run"))
- depends_on("python@2.7:2.8,3.5:", when="@44", type=("build", "run"))
- depends_on("python@2.7:2.8,3.4:", when="@:43", type=("build", "run"))
depends_on("py-pip", type="build")
def url_for_version(self, version):
diff --git a/var/spack/repos/builtin/packages/py-wheel/package.py b/var/spack/repos/builtin/packages/py-wheel/package.py
index 5cda95de12..fd6dd188fc 100644
--- a/var/spack/repos/builtin/packages/py-wheel/package.py
+++ b/var/spack/repos/builtin/packages/py-wheel/package.py
@@ -6,7 +6,7 @@
from spack.package import *
-class PyWheel(Package):
+class PyWheel(Package, PythonExtension):
"""A built-package format for Python."""
homepage = "https://github.com/pypa/wheel"
@@ -15,8 +15,6 @@ class PyWheel(Package):
)
list_url = "https://pypi.org/simple/wheel/"
- maintainers = ["adamjstewart"]
-
version(
"0.37.1",
sha256="4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a",
@@ -74,9 +72,6 @@ class PyWheel(Package):
)
extends("python")
- depends_on("python@2.7:2.8,3.5:", when="@0.34:", type=("build", "run"))
- depends_on("python@2.7:2.8,3.4:", when="@0.30:", type=("build", "run"))
- depends_on("python@2.6:2.8,3.2:", type=("build", "run"))
depends_on("py-pip", type="build")
def install(self, spec, prefix):