diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-12-06 20:08:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 20:08:26 +0100 |
| commit | d910b3725b6bc6e16e98ffb14ce69047ad9689ef (patch) | |
| tree | 7171eefc890495d63bdff0cff142484ca4814bb0 | |
| parent | 99f209019e29ffdf185cdaf16aadc203cf7eb1c2 (diff) | |
| download | spack-d910b3725b6bc6e16e98ffb14ce69047ad9689ef.tar.gz spack-d910b3725b6bc6e16e98ffb14ce69047ad9689ef.tar.bz2 spack-d910b3725b6bc6e16e98ffb14ce69047ad9689ef.tar.xz spack-d910b3725b6bc6e16e98ffb14ce69047ad9689ef.zip | |
Add back depends_on directives needed to bootstrap on Python 3.6 (#34355)
This partially reverts commit 95b5d541291aae3b85a1582e2d0e39066ca4e17a.
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pip/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-setuptools/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-wheel/package.py | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py index 7bd7949be4..abe4cf50ec 100644 --- a/var/spack/repos/builtin/packages/py-pip/package.py +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -74,6 +74,12 @@ class PyPip(Package, PythonExtension): ) 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 e4b292f738..eeeae52f02 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -176,6 +176,11 @@ class PySetuptools(Package, PythonExtension): ) 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 fd6dd188fc..d74cf52fa9 100644 --- a/var/spack/repos/builtin/packages/py-wheel/package.py +++ b/var/spack/repos/builtin/packages/py-wheel/package.py @@ -72,6 +72,9 @@ class PyWheel(Package, PythonExtension): ) 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): |