From 2380810d60fa49ec68f8d4f70169eb6378eceb35 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 14 Apr 2023 02:08:19 -0500 Subject: py-lightning: add v1.9.5 (#36803) --- .../repos/builtin/packages/py-lightning/package.py | 28 ++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-lightning/package.py b/var/spack/repos/builtin/packages/py-lightning/package.py index 577b3c78e5..c75e8f8b02 100644 --- a/var/spack/repos/builtin/packages/py-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-lightning/package.py @@ -18,13 +18,14 @@ class PyLightning(PythonPackage): version("2.0.1", sha256="abf4f9e10b0d97348336038db79f4efc75daa2f3f81876822273023294d6ef3e") version("2.0.0", sha256="dfe158aa91ac139d8bdfccc7cdb627072e0052076ae9c0459c8fa12a028dbe6c") + version("1.9.5", sha256="4a6ee1bf338f7677f04d339b84dd0c9c0fa407c3dacea366a111dc86476d4dec") variant( "extra", default=False, description="Install extra dependencies for full functionality" ) # src/lightning/__setup__.py - depends_on("python@3.8:", type=("build", "run")) + depends_on("python@3.8:", when="@2:", type=("build", "run")) depends_on("py-setuptools", type="build") # src/lightning.egg-info/requires.txt @@ -39,17 +40,21 @@ class PyLightning(PythonPackage): depends_on("py-fastapi@:0.88", type=("build", "run")) depends_on("py-fsspec@2022.5:2023+http", type=("build", "run")) depends_on("py-inquirer@2.10:4", type=("build", "run")) - depends_on("py-lightning-cloud@0.5.31:", type=("build", "run")) - depends_on("py-lightning-utilities@0.7:1", type=("build", "run")) + depends_on("py-lightning-cloud@0.5.31:", when="@2:", type=("build", "run")) + depends_on("py-lightning-cloud@0.5.27:", when="@:1", type=("build", "run")) + depends_on("py-lightning-utilities@0.7:1", when="@2:", type=("build", "run")) + depends_on("py-lightning-utilities@0.6.0.post0:1", when="@:1", type=("build", "run")) depends_on("py-numpy@1.17.2:2", type=("build", "run")) depends_on("py-packaging@17.1:24", type=("build", "run")) depends_on("py-psutil@:6", type=("build", "run")) depends_on("py-pydantic@:2", type=("build", "run")) depends_on("py-requests@:3", type=("build", "run")) - depends_on("py-rich@12.3:14", type=("build", "run")) + depends_on("py-rich@12.3:14", when="@2:", type=("build", "run")) + depends_on("py-rich@:14", when="@:1", type=("build", "run")) depends_on("py-starlette@:1", type=("build", "run")) depends_on("py-starsessions@1.2.1:1", type=("build", "run")) - depends_on("py-torch@1.11:3", type=("build", "run")) + depends_on("py-torch@1.11:3", when="@2:", type=("build", "run")) + depends_on("py-torch@1.10:3", when="@:1", type=("build", "run")) depends_on("py-torchmetrics@0.7:1", type=("build", "run")) depends_on("py-tqdm@4.57:5", type=("build", "run")) depends_on("py-traitlets@5.3:6", type=("build", "run")) @@ -58,21 +63,24 @@ class PyLightning(PythonPackage): depends_on("py-uvicorn@:1", type=("build", "run")) depends_on("py-websocket-client@:2", type=("build", "run")) depends_on("py-websockets@:11", type=("build", "run")) - depends_on("py-pytorch-lightning", type=("build", "run")) + depends_on("py-pytorch-lightning", when="@2:", type=("build", "run")) with when("+extra"): depends_on("py-aiohttp@3.8:3", type=("build", "run")) depends_on("py-docker@5:6", type=("build", "run")) depends_on("py-hydra-core@1.0.5:1", type=("build", "run")) - depends_on("py-jsonargparse@4.18:4", type=("build", "run")) - depends_on("py-lightning-fabric@1.9:", type=("build", "run")) + depends_on("py-jsonargparse@4.18:4", when="@2:", type=("build", "run")) + depends_on("py-jsonargparse@4.18:4+signatures", when="@:1", type=("build", "run")) + depends_on("py-lightning-fabric@1.9:", when="@2:", type=("build", "run")) depends_on("py-lightning-api-access@0.0.3:", type=("build", "run")) depends_on("py-matplotlib@3.2:3", type=("build", "run")) depends_on("py-omegaconf@2.0.5:2", type=("build", "run")) depends_on("py-panel@0.12.7:0", type=("build", "run")) - depends_on("py-pytorch-lightning@1.9:", type=("build", "run")) + depends_on("py-pytorch-lightning@1.9:", when="@2:", type=("build", "run")) + depends_on("py-pytorch-lightning@1.8.1:", when="@:1", type=("build", "run")) depends_on("py-redis@4.0.1:4", type=("build", "run")) - depends_on("py-rich@12.3:13", type=("build", "run")) + depends_on("py-rich@12.3:13", when="@2:", type=("build", "run")) + depends_on("py-rich@10.14:13", when="@:1", type=("build", "run")) depends_on("py-s3fs@2022.5:2022", type=("build", "run")) depends_on("py-streamlit@1.13:1", type=("build", "run")) depends_on("py-tensorboardx@2.2:2", type=("build", "run")) -- cgit v1.2.3-60-g2f50