summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2024-07-17 20:11:42 +0200
committerGitHub <noreply@github.com>2024-07-17 11:11:42 -0700
commit4710cbb281218154c6312f5a20bf6483f103d061 (patch)
tree9ef16f8a516d98356b45984f5dd4b3a6da9f46ee /var
parent9ae1014e552ea6ccb37770f535bb0901e8c467e9 (diff)
downloadspack-4710cbb281218154c6312f5a20bf6483f103d061.tar.gz
spack-4710cbb281218154c6312f5a20bf6483f103d061.tar.bz2
spack-4710cbb281218154c6312f5a20bf6483f103d061.tar.xz
spack-4710cbb281218154c6312f5a20bf6483f103d061.zip
py-lightning: setuptools required at run-time (#45260)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-lightning/package.py3
-rw-r--r--var/spack/repos/builtin/packages/py-pytorch-lightning/package.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-lightning/package.py b/var/spack/repos/builtin/packages/py-lightning/package.py
index 5211df5690..791ab781b6 100644
--- a/var/spack/repos/builtin/packages/py-lightning/package.py
+++ b/var/spack/repos/builtin/packages/py-lightning/package.py
@@ -79,6 +79,9 @@ class PyLightning(PythonPackage):
# depends_on("py-pytorch-lightning", when="@2:")
# Historical requirements
+ # https://github.com/Lightning-AI/pytorch-lightning/pull/20081
+ depends_on("py-setuptools", when="@:2.3")
+
with when("@:2.0"):
depends_on("py-jinja2@:4")
depends_on("py-arrow@1.2:2")
diff --git a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py
index a03b208c3e..133f882e37 100644
--- a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py
+++ b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py
@@ -52,7 +52,8 @@ class PyPytorchLightning(PythonPackage):
# src/pytorch_lightning/__setup__.py
depends_on("python@3.8:", when="@2:", type=("build", "run"))
- depends_on("py-setuptools", type="build")
+ # https://github.com/Lightning-AI/pytorch-lightning/pull/20081
+ depends_on("py-setuptools", type=("build", "run"))
# requirements/pytorch/base.txt
depends_on("py-numpy@1.17.2:", when="@1.3:", type=("build", "run"))