py-lightning: add v2.3 (#44731)

Co-authored-by: adamjstewart <adamjstewart@users.noreply.github.com>

1 files changed, 77 insertions, 66 deletions

diff --git a/var/spack/repos/builtin/packages/py-lightning/package.py b/var/spack/repos/builtin/packages/py-lightning/package.py
index cee444adfb..5211df5690 100644
--- a/var/spack/repos/builtin/packages/py-lightning/package.py
+++ b/var/spack/repos/builtin/packages/py-lightning/package.py
@@ -17,6 +17,9 @@ class PyLightning(PythonPackage):
 
     license("Apache-2.0")
 
+    version("2.3.0", sha256="4bb4d6e3650d2d5f544ad60853a22efc4e164aa71b9596d13f0454b29df05130")
+    version("2.2.5", sha256="a6c31a2052fc30fee34aec7e31ea2a117a005d049c3593fc9cfb867a34f962bf")
+    version("2.2.4", sha256="4cc3fb3edf04fcd63c0ecf75087d2fa06163759fc8c1fc500b16404ac1854f77")
     version("2.2.3", sha256="9f208d57ad9c1ae40918136dbef673f02d8e9ab519d33237a6e74984bcd73d96")
     version("2.2.2", sha256="799e933bf51f3f10516b3f1acf3650e4bc063682eb5b5dc9dcbd1ebd38e03e3a")
     version("2.2.1", sha256="b3e46d596b32cafd1fb9b21fdba1b1767df97b1af5cc702693d1c51df60b19aa")
@@ -36,77 +39,85 @@ class PyLightning(PythonPackage):
     version("2.0.2", sha256="fa32d671850a5be2d961c6705c927f6f48d1cf9696f61f7d865244142e684430")
     version("2.0.1", sha256="abf4f9e10b0d97348336038db79f4efc75daa2f3f81876822273023294d6ef3e")
     version("2.0.0", sha256="dfe158aa91ac139d8bdfccc7cdb627072e0052076ae9c0459c8fa12a028dbe6c")
-    version("1.9.5", sha256="4a6ee1bf338f7677f04d339b84dd0c9c0fa407c3dacea366a111dc86476d4dec")
+    version(
+        "1.9.5",
+        sha256="4a6ee1bf338f7677f04d339b84dd0c9c0fa407c3dacea366a111dc86476d4dec",
+        deprecated=True,
+    )
 
-    # src/lightning/__setup__.py
-    depends_on("python@3.8:", when="@2:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
 
-    # src/lightning.egg-info/requires.txt
-    depends_on("py-pyyaml@5.4:7", type=("build", "run"))
-    depends_on("py-fsspec@2022.5:2024+http", when="@2.1.3:", type=("build", "run"))
-    depends_on("py-fsspec@2021.6.1:2024+http", when="@2.1.0:2.1.2", type=("build", "run"))
-    depends_on("py-fsspec@2022.5:2024+http", when="@2.0.5:2.0", type=("build", "run"))
-    depends_on("py-fsspec@2022.5:2023+http", when="@:2.0.4", type=("build", "run"))
-    depends_on("py-lightning-utilities@0.8:1", when="@2.1:", type=("build", "run"))
-    depends_on("py-lightning-utilities@0.7:1", when="@2.0", 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@20:24", when="@2.1:", type=("build", "run"))
-    depends_on("py-packaging@17.1:24", when="@:2.0", type=("build", "run"))
-    depends_on("py-torch@1.13:3", when="@2.2:", type=("build", "run"))
-    depends_on("py-torch@1.12:3", when="@2.1", type=("build", "run"))
-    depends_on("py-torch@1.11:3", when="@2.0", type=("build", "run"))
-    depends_on("py-torch@1.10:3", when="@:1", type=("build", "run"))
-    depends_on("py-torchmetrics@0.7:2", when="@2.0.9:", type=("build", "run"))
-    depends_on("py-torchmetrics@0.7:1", when="@:2.0.8", type=("build", "run"))
-    depends_on("py-tqdm@4.57:5", type=("build", "run"))
-    depends_on("py-typing-extensions@4.4:5", when="@2.2:", type=("build", "run"))
-    depends_on("py-typing-extensions@4:5", type=("build", "run"))
+    with default_args(type=("build", "run")):
+        # src/lightning/__setup__.py
+        depends_on("python@3.8:", when="@2:")
 
-    # Only an alias, not actually used by the library
-    # depends_on("py-pytorch-lightning", when="@2:", type=("build", "run"))
+        # src/lightning.egg-info/requires.txt
+        depends_on("py-pyyaml@5.4:7")
+        depends_on("py-fsspec@2022.5:2025+http", when="@2.3:")
+        depends_on("py-fsspec@2022.5:2024+http", when="@2.1.3:2.2")
+        depends_on("py-fsspec@2021.6.1:2024+http", when="@2.1.0:2.1.2")
+        depends_on("py-fsspec@2022.5:2024+http", when="@2.0.5:2.0")
+        depends_on("py-fsspec@2022.5:2023+http", when="@:2.0.4")
+        depends_on("py-lightning-utilities@0.8:1", when="@2.1:")
+        depends_on("py-lightning-utilities@0.7:1", when="@2.0")
+        depends_on("py-lightning-utilities@0.6.0.post0:1", when="@:1")
+        depends_on("py-numpy@1.17.2:2")
+        depends_on("py-packaging@20:24", when="@2.1:")
+        depends_on("py-packaging@17.1:24", when="@:2.0")
+        depends_on("py-torch@2:3", when="@2.3:")
+        depends_on("py-torch@1.13:3", when="@2.2:")
+        depends_on("py-torch@1.12:3", when="@2.1")
+        depends_on("py-torch@1.11:3", when="@2.0")
+        depends_on("py-torch@1.10:3", when="@:1")
+        depends_on("py-torchmetrics@0.7:2", when="@2.0.9:")
+        depends_on("py-torchmetrics@0.7:1", when="@:2.0.8")
+        depends_on("py-tqdm@4.57:5")
+        depends_on("py-typing-extensions@4.4:5", when="@2.2:")
+        depends_on("py-typing-extensions@4:5")
 
-    # Historical requirements
-    with when("@:2.0"):
-        depends_on("py-jinja2@:4", type=("build", "run"))
-        depends_on("py-arrow@1.2:2", type=("build", "run"))
-        depends_on("py-backoff@2.2.1:3", when="@2.0.5:", type=("build", "run"))
-        depends_on("py-beautifulsoup4@4.8:5", type=("build", "run"))
-        depends_on("py-click@:9", type=("build", "run"))
-        depends_on("py-croniter@1.3:1.4", when="@2.0.5:", type=("build", "run"))
-        depends_on("py-croniter@1.3", when="@:2.0.4", type=("build", "run"))
-        depends_on("py-dateutils@:1", type=("build", "run"))
-        depends_on("py-deepdiff@5.7:7", type=("build", "run"))
-        depends_on("py-fastapi@0.92:1", when="@2.0.4:", type=("build", "run"))
-        depends_on("py-fastapi@0.69:0.88", when="@2.0.3", type=("build", "run"))
-        depends_on("py-fastapi@:0.88", when="@:2.0.2", type=("build", "run"))
-        depends_on("py-inquirer@2.10:4", type=("build", "run"))
-        depends_on("py-lightning-cloud@0.5.38:", when="@2.0.9:", type=("build", "run"))
-        depends_on("py-lightning-cloud@0.5.37:", when="@2.0.5:", type=("build", "run"))
-        depends_on("py-lightning-cloud@0.5.34:", when="@2.0.3:", 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-psutil@:6", type=("build", "run"))
-        depends_on("py-pydantic@1.7.4:2.1", when="@2.0.7:", type=("build", "run"))
-        depends_on("py-pydantic@1.7.4:2.0", when="@2.0.6", type=("build", "run"))
-        depends_on("py-pydantic@1.7.4:1", when="@2.0.5", type=("build", "run"))
-        depends_on("py-pydantic@1.7.4:3", when="@2.0.3:2.0.4", type=("build", "run"))
-        depends_on("py-pydantic@:2", when="@:2.0.2", type=("build", "run"))
-        depends_on("py-python-multipart@0.0.5:1", type=("build", "run"))
-        depends_on("py-requests@:3", 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", when="@2.0.3:", type=("build", "run"))
-        depends_on("py-starlette@:1", when="@:2.0.2", type=("build", "run"))
-        depends_on("py-starsessions@1.2.1:1", type=("build", "run"))
-        depends_on("py-traitlets@5.3:6", type=("build", "run"))
-        depends_on("py-urllib3@:3", when="@2.0.4:", type=("build", "run"))
-        depends_on("py-urllib3@:2", when="@:2.0.3", type=("build", "run"))
-        depends_on("py-uvicorn@:1", type=("build", "run"))
-        depends_on("py-websocket-client@:2", type=("build", "run"))
-        depends_on("py-websockets@:12", when="@2.0.5:", type=("build", "run"))
-        depends_on("py-websockets@:11", when="@:2.0.4", type=("build", "run"))
+        # Only an alias, not actually used by the library
+        # depends_on("py-pytorch-lightning", when="@2:")
+
+        # Historical requirements
+        with when("@:2.0"):
+            depends_on("py-jinja2@:4")
+            depends_on("py-arrow@1.2:2")
+            depends_on("py-backoff@2.2.1:3", when="@2.0.5:")
+            depends_on("py-beautifulsoup4@4.8:5")
+            depends_on("py-click@:9")
+            depends_on("py-croniter@1.3:1.4", when="@2.0.5:")
+            depends_on("py-croniter@1.3", when="@:2.0.4")
+            depends_on("py-dateutils@:1")
+            depends_on("py-deepdiff@5.7:7")
+            depends_on("py-fastapi@0.92:1", when="@2.0.4:")
+            depends_on("py-fastapi@0.69:0.88", when="@2.0.3")
+            depends_on("py-fastapi@:0.88", when="@:2.0.2")
+            depends_on("py-inquirer@2.10:4")
+            depends_on("py-lightning-cloud@0.5.38:", when="@2.0.9:")
+            depends_on("py-lightning-cloud@0.5.37:", when="@2.0.5:")
+            depends_on("py-lightning-cloud@0.5.34:", when="@2.0.3:")
+            depends_on("py-lightning-cloud@0.5.31:", when="@2:")
+            depends_on("py-lightning-cloud@0.5.27:", when="@:1")
+            depends_on("py-psutil@:6")
+            depends_on("py-pydantic@1.7.4:2.1", when="@2.0.7:")
+            depends_on("py-pydantic@1.7.4:2.0", when="@2.0.6")
+            depends_on("py-pydantic@1.7.4:1", when="@2.0.5")
+            depends_on("py-pydantic@1.7.4:3", when="@2.0.3:2.0.4")
+            depends_on("py-pydantic@:2", when="@:2.0.2")
+            depends_on("py-python-multipart@0.0.5:1")
+            depends_on("py-requests@:3")
+            depends_on("py-rich@12.3:14", when="@2:")
+            depends_on("py-rich@:14", when="@:1")
+            depends_on("py-starlette", when="@2.0.3:")
+            depends_on("py-starlette@:1", when="@:2.0.2")
+            depends_on("py-starsessions@1.2.1:1")
+            depends_on("py-traitlets@5.3:6")
+            depends_on("py-urllib3@:3", when="@2.0.4:")
+            depends_on("py-urllib3@:2", when="@:2.0.3")
+            depends_on("py-uvicorn@:1")
+            depends_on("py-websocket-client@:2")
+            depends_on("py-websockets@:12", when="@2.0.5:")
+            depends_on("py-websockets@:11", when="@:2.0.4")
 
     # https://github.com/Lightning-AI/lightning/issues/18858
     conflicts("^py-torch~distributed", when="@2.1.0")