summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2024-11-24 15:23:11 +0100
committerGitHub <noreply@github.com>2024-11-24 15:23:11 +0100
commit124b616b2773af70c0188f910a17e9ce093caf51 (patch)
treeedf3cfbfef66ed51a914deaf2ae170beb23f7902
parent1148c8f195d812e5bd586f404edd403579ed5df2 (diff)
downloadspack-124b616b2773af70c0188f910a17e9ce093caf51.tar.gz
spack-124b616b2773af70c0188f910a17e9ce093caf51.tar.bz2
spack-124b616b2773af70c0188f910a17e9ce093caf51.tar.xz
spack-124b616b2773af70c0188f910a17e9ce093caf51.zip
add a few forward compat bounds with python (#47761)
-rw-r--r--var/spack/repos/builtin/packages/py-ipykernel/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-nodeenv/package.py8
-rw-r--r--var/spack/repos/builtin/packages/py-notebook/package.py8
3 files changed, 14 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py
index 02f2c943b4..047cfdc73d 100644
--- a/var/spack/repos/builtin/packages/py-ipykernel/package.py
+++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py
@@ -54,6 +54,8 @@ class PyIpykernel(PythonPackage):
with default_args(type=("build", "run")):
depends_on("python@3.8:", when="@6.22:")
+ # use of `imp` module
+ depends_on("python@:3.11", when="@:6.10")
depends_on("py-debugpy@1.6.5:", when="@6.22:")
depends_on("py-debugpy@1:", when="@6.11:")
depends_on("py-debugpy@1.0:1", when="@6:6.10")
diff --git a/var/spack/repos/builtin/packages/py-nodeenv/package.py b/var/spack/repos/builtin/packages/py-nodeenv/package.py
index 6fddf220e4..c52dfce401 100644
--- a/var/spack/repos/builtin/packages/py-nodeenv/package.py
+++ b/var/spack/repos/builtin/packages/py-nodeenv/package.py
@@ -16,6 +16,10 @@ class PyNodeenv(PythonPackage):
version("1.7.0", sha256="e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b")
version("1.3.3", sha256="ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a")
- depends_on("python +ssl", when="@1.5:", type=("build", "run"))
- depends_on("py-setuptools", when="@1.7:", type=("build", "run"))
+ with default_args(type=("build", "run")):
+ # https://github.com/ekalinin/nodeenv/commit/c1dffc5c64377cfcda9f2befd357e4791903bf39
+ depends_on("python@:3.12", when="@:1.8")
+ depends_on("python +ssl", when="@1.5:")
+ depends_on("py-setuptools", when="@1.7:")
+
depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py
index 1f62831bfc..3c029772d6 100644
--- a/var/spack/repos/builtin/packages/py-notebook/package.py
+++ b/var/spack/repos/builtin/packages/py-notebook/package.py
@@ -38,8 +38,12 @@ class PyNotebook(PythonPackage):
version("4.0.4", sha256="a57852514bce1b1cf41fa0311f6cf894960cf68b083b55e6c408316b598d5648")
version("4.0.2", sha256="8478d7e2ab474855b0ff841f693983388af8662d3af1adcb861acb900274f22a")
- depends_on("python@3.7:", type=("build", "run"), when="@6.4:")
- depends_on("python@3.6:", type=("build", "run"), when="@6.3:")
+ with default_args(type=("build", "run")):
+ depends_on("python@3.7:", when="@6.4:")
+ depends_on("python@3.6:", when="@6.3:")
+ # import pipes in setupbase.py
+ depends_on("python@:3.12", when="@:6")
+
depends_on("py-jupyter-packaging@0.9:0", when="@6.4.1:", type="build")
depends_on("py-setuptools", when="@5:", type="build")