From 7d5007b5e43d5ee6a6e480f667e85a35a9601e1e Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:00:40 +0200 Subject: Restrict py-pip version for packages using --install-option (#38837) --- var/spack/repos/builtin/packages/py-networkit/package.py | 2 ++ var/spack/repos/builtin/packages/py-pymol/package.py | 2 ++ var/spack/repos/builtin/packages/py-pyside/package.py | 2 ++ var/spack/repos/builtin/packages/py-pyside2/package.py | 2 ++ var/spack/repos/builtin/packages/py-shiboken/package.py | 2 ++ 5 files changed, 10 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-networkit/package.py b/var/spack/repos/builtin/packages/py-networkit/package.py index b3a337455f..6279cb0a01 100644 --- a/var/spack/repos/builtin/packages/py-networkit/package.py +++ b/var/spack/repos/builtin/packages/py-networkit/package.py @@ -44,6 +44,8 @@ class PyNetworkit(PythonPackage): depends_on("py-scipy", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("python@3:", type=("build", "run")) + # in newer pip versions --install-option does not exist + depends_on("py-pip@:23.0", type="build") def install_options(self, spec, prefix): # Enable ext. core-library + parallel build diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py index 3f95868e04..4d3b007eab 100644 --- a/var/spack/repos/builtin/packages/py-pymol/package.py +++ b/var/spack/repos/builtin/packages/py-pymol/package.py @@ -21,6 +21,8 @@ class PyPymol(PythonPackage): depends_on("python+tkinter@2.7:", type=("build", "link", "run"), when="@2.3.0:2.4.0") depends_on("python+tkinter@3.6:", type=("build", "link", "run"), when="@2.5.0:") + # in newer pip versions --install-option does not exist + depends_on("py-pip@:23.0", type="build") depends_on("gl") depends_on("glew") depends_on("libpng") diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index 5d5dd16acf..42c4553c34 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -36,6 +36,8 @@ class PyPyside(PythonPackage): depends_on("cmake", 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-sphinx", type=("build", "run")) depends_on("py-sphinx@:3.5.0", type=("build", "run"), when="@:1.2.2") depends_on("qt@4.5:4.9") diff --git a/var/spack/repos/builtin/packages/py-pyside2/package.py b/var/spack/repos/builtin/packages/py-pyside2/package.py index 3c9005d8a6..43cfdeb0fe 100644 --- a/var/spack/repos/builtin/packages/py-pyside2/package.py +++ b/var/spack/repos/builtin/packages/py-pyside2/package.py @@ -42,6 +42,8 @@ class PyPyside2(PythonPackage): depends_on("py-wheel", type="build") # https://bugreports.qt.io/browse/PYSIDE-1385 depends_on("py-wheel@:0.34", when="@:5.14", type="build") + # in newer pip versions --install-option does not exist + depends_on("py-pip@:23.0", type="build") depends_on("qt@5.11:+opengl") depends_on("graphviz", when="+doc", type="build") diff --git a/var/spack/repos/builtin/packages/py-shiboken/package.py b/var/spack/repos/builtin/packages/py-shiboken/package.py index 057f19c4f6..15e1c2321b 100644 --- a/var/spack/repos/builtin/packages/py-shiboken/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken/package.py @@ -19,6 +19,8 @@ class PyShiboken(PythonPackage): depends_on("cmake", 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-sphinx@:3.4", type=("build", "run")) depends_on("libxml2") depends_on("qt@:4.8") -- cgit v1.2.3-60-g2f50