From f15efd27bdb7a679622105ad537692a5039d1b5a Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Wed, 22 Mar 2023 08:08:19 -0500
Subject: py-lightning: fix dependencies (#36213)

---
 .../builtin/packages/py-aiobotocore/package.py     |  5 +-
 .../repos/builtin/packages/py-botocore/package.py  |  7 +-
 .../repos/builtin/packages/py-croniter/package.py  | 18 ++++
 .../repos/builtin/packages/py-dateutils/package.py | 19 +++++
 .../repos/builtin/packages/py-deepdiff/package.py  |  5 +-
 .../builtin/packages/py-email-validator/package.py | 19 +++++
 .../repos/builtin/packages/py-fastapi/package.py   | 17 +++-
 .../repos/builtin/packages/py-httpcore/package.py  | 10 ++-
 .../repos/builtin/packages/py-httptools/package.py |  3 +-
 .../repos/builtin/packages/py-httpx/package.py     | 26 +++---
 .../repos/builtin/packages/py-inquirer/package.py  | 21 +++++
 .../packages/py-lightning-api-access/package.py    | 22 +++++
 .../builtin/packages/py-lightning-cloud/package.py | 25 ++++++
 .../packages/py-lightning-fabric/package.py        | 27 ++++++
 .../repos/builtin/packages/py-lightning/package.py | 98 +++++++++++-----------
 .../repos/builtin/packages/py-maturin/package.py   |  1 +
 .../repos/builtin/packages/py-orjson/package.py    | 17 ++++
 .../repos/builtin/packages/py-panel/package.py     | 27 ++++++
 .../builtin/packages/py-pyviz-comms/package.py     | 18 ++++
 .../repos/builtin/packages/py-readchar/package.py  | 17 ++++
 .../repos/builtin/packages/py-redis/package.py     |  9 +-
 .../repos/builtin/packages/py-s3fs/package.py      |  9 +-
 .../builtin/packages/py-starsessions/package.py    | 21 +++++
 .../repos/builtin/packages/py-streamlit/package.py | 39 +++++++++
 .../repos/builtin/packages/py-ujson/package.py     |  6 +-
 .../repos/builtin/packages/py-uvicorn/package.py   | 15 +++-
 .../builtin/packages/py-validators/package.py      | 18 ++++
 .../builtin/packages/py-watchfiles/package.py      | 18 ++++
 .../builtin/packages/py-websockets/package.py      |  9 +-
 29 files changed, 453 insertions(+), 93 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/py-croniter/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-dateutils/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-email-validator/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-inquirer/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-lightning-api-access/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-lightning-cloud/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-lightning-fabric/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-orjson/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-panel/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-pyviz-comms/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-readchar/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-starsessions/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-streamlit/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-validators/package.py
 create mode 100644 var/spack/repos/builtin/packages/py-watchfiles/package.py

diff --git a/var/spack/repos/builtin/packages/py-aiobotocore/package.py b/var/spack/repos/builtin/packages/py-aiobotocore/package.py
index 3e63b8e550..ecfb8a974b 100644
--- a/var/spack/repos/builtin/packages/py-aiobotocore/package.py
+++ b/var/spack/repos/builtin/packages/py-aiobotocore/package.py
@@ -12,11 +12,12 @@ class PyAiobotocore(PythonPackage):
     homepage = "https://aiobotocore.readthedocs.io/en/latest/"
     pypi = "aiobotocore/aiobotocore-1.2.1.tar.gz"
 
+    version("2.4.2", sha256="0603b74a582dffa7511ce7548d07dc9b10ec87bc5fb657eb0b34f9bd490958bf")
     version("1.2.1", sha256="58cc422e65fc89f7cb78eca740d241ac8e15f39f6b308cc23152711e8a987d45")
 
-    depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-botocore@1.19.52", type=("build", "run"))
+    depends_on("py-botocore@1.27.59", when="@2.4.2", type=("build", "run"))
+    depends_on("py-botocore@1.19.52", when="@1.2.1", type=("build", "run"))
     depends_on("py-aiohttp@3.3.1:", type=("build", "run"))
     depends_on("py-wrapt@1.10.10:", type=("build", "run"))
     depends_on("py-aioitertools@0.5.1:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-botocore/package.py b/var/spack/repos/builtin/packages/py-botocore/package.py
index 7d32b36085..ec9fcd8600 100644
--- a/var/spack/repos/builtin/packages/py-botocore/package.py
+++ b/var/spack/repos/builtin/packages/py-botocore/package.py
@@ -17,6 +17,7 @@ class PyBotocore(PythonPackage):
     version("1.29.26", sha256="f71220fe5a5d393c391ed81a291c0d0985f147568c56da236453043f93727a34")
     version("1.28.5", sha256="f322d7b62163219ffeb787a116d318273dfb7243c3b49d95f5bfff8daa1df4e0")
     version("1.27.96", sha256="fc0a13ef6042e890e361cf408759230f8574409bb51f81740d2e5d8ad5d1fbea")
+    version("1.27.59", sha256="eda4aed6ee719a745d1288eaf1beb12f6f6448ad1fa12f159405db14ba9c92cf")
     version("1.26.10", sha256="5df2cf7ebe34377470172bd0bbc582cf98c5cbd02da0909a14e9e2885ab3ae9c")
     version("1.25.13", sha256="d99381bda4eed5896b74f6250132e2e6484c2d6e406b1def862113ffdb41c523")
     version("1.24.46", sha256="89a203bba3c8f2299287e48a9e112e2dbe478cf67eaac26716f0e7f176446146")
@@ -34,12 +35,6 @@ class PyBotocore(PythonPackage):
     version("1.12.253", sha256="3baf129118575602ada9926f5166d82d02273c250d0feb313fc270944b27c48b")
     version("1.12.169", sha256="25b44c3253b5ed1c9093efb57ffca440c5099a2d62fa793e8b6c52e72f54b01e")
 
-    depends_on("python@2.6:", when="@1.12:1.13", type=("build", "run"))
-    depends_on("python@2.7:", when="@1.19", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.6:", when="@1.20", type=("build", "run"))
-    depends_on("python@3.6:", when="@1.21:", type=("build", "run"))
-    depends_on("python@3.7:", when="@1.26:", type=("build", "run"))
-
     depends_on("py-setuptools", type="build")
     depends_on("py-jmespath@0.7.1:0", type=("build", "run"), when="@:1.23")
     depends_on("py-jmespath@0.7.1:1", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-croniter/package.py b/var/spack/repos/builtin/packages/py-croniter/package.py
new file mode 100644
index 0000000000..9a63a33f87
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-croniter/package.py
@@ -0,0 +1,18 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyCroniter(PythonPackage):
+    """croniter provides iteration for datetime object with cron like format."""
+
+    homepage = "http://github.com/kiorky/croniter"
+    pypi = "croniter/croniter-1.3.8.tar.gz"
+
+    version("1.3.8", sha256="32a5ec04e97ec0837bcdf013767abd2e71cceeefd3c2e14c804098ce51ad6cd9")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-python-dateutil", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-dateutils/package.py b/var/spack/repos/builtin/packages/py-dateutils/package.py
new file mode 100644
index 0000000000..84bc4ff6c9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-dateutils/package.py
@@ -0,0 +1,19 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyDateutils(PythonPackage):
+    """Various utilities for working with date and datetime objects."""
+
+    homepage = "https://github.com/jmcantrell/python-dateutils"
+    pypi = "dateutils/dateutils-0.6.12.tar.gz"
+
+    version("0.6.12", sha256="03dd90bcb21541bd4eb4b013637e4f1b5f944881c46cc6e4b67a6059e370e3f1")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-python-dateutil", type=("build", "run"))
+    depends_on("py-pytz", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-deepdiff/package.py b/var/spack/repos/builtin/packages/py-deepdiff/package.py
index 91e5909a85..ed4f4ddedc 100644
--- a/var/spack/repos/builtin/packages/py-deepdiff/package.py
+++ b/var/spack/repos/builtin/packages/py-deepdiff/package.py
@@ -12,8 +12,9 @@ class PyDeepdiff(PythonPackage):
     homepage = "https://github.com/seperman/deepdiff"
     pypi = "deepdiff/deepdiff-5.6.0.tar.gz"
 
+    version("6.3.0", sha256="6a3bf1e7228ac5c71ca2ec43505ca0a743ff54ec77aa08d7db22de6bc7b2b644")
     version("5.6.0", sha256="e3f1c3a375c7ea5ca69dba6f7920f9368658318ff1d8a496293c79481f48e649")
 
-    depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-ordered-set@4.0.2", type=("build", "run"))
+    depends_on("py-ordered-set@4.0.2:4.1", when="@6:", type=("build", "run"))
+    depends_on("py-ordered-set@4.0.2", when="@:5", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-email-validator/package.py b/var/spack/repos/builtin/packages/py-email-validator/package.py
new file mode 100644
index 0000000000..463fba06d3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-email-validator/package.py
@@ -0,0 +1,19 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyEmailValidator(PythonPackage):
+    """A robust email address syntax and deliverability validation library."""
+
+    homepage = "https://github.com/JoshData/python-email-validator"
+    pypi = "email_validator/email_validator-1.3.1.tar.gz"
+
+    version("1.3.1", sha256="d178c5c6fa6c6824e9b04f199cf23e79ac15756786573c190d2ad13089411ad2")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-dnspython@1.15:", type=("build", "run"))
+    depends_on("py-idna@2:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-fastapi/package.py b/var/spack/repos/builtin/packages/py-fastapi/package.py
index 311296e047..05c4db40c2 100644
--- a/var/spack/repos/builtin/packages/py-fastapi/package.py
+++ b/var/spack/repos/builtin/packages/py-fastapi/package.py
@@ -15,8 +15,21 @@ class PyFastapi(PythonPackage):
 
     version("0.88.0", sha256="915bf304180a0e7c5605ec81097b7d4cd8826ff87a02bb198e336fb9f3b5ff02")
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-hatchling", type="build")
+    variant("all", default=False, description="Build all optional dependencies")
 
+    depends_on("py-hatchling", type="build")
     depends_on("py-starlette@0.22.0", type=("build", "run"))
     depends_on("py-pydantic@1.6.2:1.6,1.7.4:1.7,1.8.2:1", type=("build", "run"))
+
+    with when("+all"):
+        depends_on("py-httpx@0.23:", type=("build", "run"))
+        depends_on("py-jinja2@2.11.2:", type=("build", "run"))
+        depends_on("py-python-multipart@0.0.5:", type=("build", "run"))
+        depends_on("py-itsdangerous@1.1:", type=("build", "run"))
+        depends_on("py-pyyaml@5.3.1:", type=("build", "run"))
+        depends_on("py-ujson@4.0.1:", type=("build", "run"))
+        depends_on("py-orjson@3.2.1:", type=("build", "run"))
+        depends_on("py-email-validator@1.1.1:", type=("build", "run"))
+        depends_on("py-uvicorn@0.12:+standard", type=("build", "run"))
+
+        conflicts("^py-ujson@4.0.2,4.1.0,4.2.0,4.3.0,5.0.0,5.1.0")
diff --git a/var/spack/repos/builtin/packages/py-httpcore/package.py b/var/spack/repos/builtin/packages/py-httpcore/package.py
index ee0b37d444..a8c2f6632e 100644
--- a/var/spack/repos/builtin/packages/py-httpcore/package.py
+++ b/var/spack/repos/builtin/packages/py-httpcore/package.py
@@ -13,13 +13,15 @@ class PyHttpcore(PythonPackage):
     homepage = "https://github.com/encode/httpcore"
     pypi = "httpcore/httpcore-0.11.0.tar.gz"
 
+    version("0.16.3", sha256="c5d6f04e2fc530f39e0c077e6a30caa53f1451096120f1f38b954afd0b17c0cb")
     version("0.14.7", sha256="7503ec1c0f559066e7e39bc4003fd2ce023d01cf51793e3c173b864eb456ead1")
     version("0.11.0", sha256="35ffc735d746b83f8fc6d36f82600e56117b9e8adc65d0c0423264b6ebfef7bf")
 
-    depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-sniffio@1.0:1", type=("build", "run"))
-    depends_on("py-h11@0.8:0.9", type=("build", "run"), when="@0.11.0")
+    depends_on("py-h11@0.13:0.14", when="@0.16.3", type=("build", "run"))
     depends_on("py-h11@0.11:0.12", type=("build", "run"), when="@0.14.7")
-    depends_on("py-anyio@3.0:3", type=("build", "run"), when="@0.14.7")
+    depends_on("py-h11@0.8:0.9", type=("build", "run"), when="@0.11.0")
+    depends_on("py-sniffio@1", type=("build", "run"))
+    depends_on("py-anyio@3:4", when="@0.16.3", type=("build", "run"))
+    depends_on("py-anyio@3", type=("build", "run"), when="@0.14.7")
     depends_on("py-certifi", type=("build", "run"), when="@0.14.7:")
diff --git a/var/spack/repos/builtin/packages/py-httptools/package.py b/var/spack/repos/builtin/packages/py-httptools/package.py
index fe9b621923..7629eb4652 100644
--- a/var/spack/repos/builtin/packages/py-httptools/package.py
+++ b/var/spack/repos/builtin/packages/py-httptools/package.py
@@ -12,7 +12,8 @@ class PyHttptools(PythonPackage):
     homepage = "https://github.com/MagicStack/httptools"
     pypi = "httptools/httptools-0.1.1.tar.gz"
 
+    version("0.5.0", sha256="295874861c173f9101960bba332429bb77ed4dcd8cdf5cee9922eb00e4f6bc09")
     version("0.1.1", sha256="41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce")
 
     depends_on("py-setuptools", type="build")
-    depends_on("py-wheel", type="build")
+    depends_on("py-cython@0.29.24:0.29", type="build")
diff --git a/var/spack/repos/builtin/packages/py-httpx/package.py b/var/spack/repos/builtin/packages/py-httpx/package.py
index e3f6718de5..d2f57abee0 100644
--- a/var/spack/repos/builtin/packages/py-httpx/package.py
+++ b/var/spack/repos/builtin/packages/py-httpx/package.py
@@ -13,31 +13,31 @@ class PyHttpx(PythonPackage):
     homepage = "https://github.com/encode/httpx"
     pypi = "httpx/httpx-0.15.2.tar.gz"
 
+    version("0.23.3", sha256="9818458eb565bb54898ccb9b8b251a28785dd4a55afbc23d0eb410754fe7d0f9")
     version("0.22.0", sha256="d8e778f76d9bbd46af49e7f062467e3157a5a3d2ae4876a4bbfd8a51ed9c9cb4")
     version("0.15.2", sha256="713a2deaf96d85bbd4a1fbdf0edb27d6b4ee2c9aaeda8433042367e4b9e1628d")
     version("0.11.1", sha256="7d2bfb726eeed717953d15dddb22da9c2fcf48a4d70ba1456aa0a7faeda33cf7")
 
     variant("http2", default=False, when="@0.15.2:", description="Enable http2 support")
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    depends_on("py-hatchling", when="@0.23:", type="build")
+    depends_on("py-hatch-fancy-pypi-readme", when="@0.23:", type="build")
     depends_on("py-certifi", type=("build", "run"))
-    depends_on("py-charset-normalizer", type=("build", "run"), when="@0.22.0:")
-
+    depends_on("py-httpcore@0.15:0.16", when="@0.23:", type=("build", "run"))
+    depends_on("py-httpcore@0.14.5:0.14", type=("build", "run"), when="@0.22")
     depends_on("py-httpcore@0.11.0:0.11", type=("build", "run"), when="@0.15.2")
-    depends_on("py-httpcore@0.14.5:0.14", type=("build", "run"), when="@0.22.0:")
-
-    depends_on("py-sniffio@1.0:1", type=("build", "run"), when="@0.11.1")
-    depends_on("py-sniffio", type=("build", "run"), when="@0.15.2:")
-
-    depends_on("py-rfc3986@1.3:1", type=("build", "run"), when="@0.11.1")
     depends_on("py-rfc3986+idna2008@1.3:1", type=("build", "run"), when="@0.15.2:")
+    depends_on("py-rfc3986@1.3:1", type=("build", "run"), when="@0.11.1")
+    depends_on("py-sniffio", type=("build", "run"), when="@0.15.2:")
+    depends_on("py-sniffio@1.0:1", type=("build", "run"), when="@0.11.1")
 
-    depends_on("py-h2@3.0:3", type=("build", "run"), when="@0.11.1")
-    depends_on("py-h2@3.0:3", type=("build", "run"), when="@0.15.2+http2")
     depends_on("py-h2@3.0:4", type=("build", "run"), when="@0.22.0:+http2")
+    depends_on("py-h2@3.0:3", type=("build", "run"), when="@0.15.2+http2")
+    depends_on("py-h2@3.0:3", type=("build", "run"), when="@0.11.1")
 
-    # Version 0.11.1 only dependencies
+    # Historical dependencies
+    depends_on("py-setuptools", when="@:0.22", type="build")
+    depends_on("py-charset-normalizer", type=("build", "run"), when="@0.22")
     depends_on("py-hstspreload", type=("build", "run"), when="@0.11.1")
     depends_on("py-chardet@3.0:3", type=("build", "run"), when="@0.11.1")
     depends_on("py-h11@0.8:0.9", type=("build", "run"), when="@0.11.1")
diff --git a/var/spack/repos/builtin/packages/py-inquirer/package.py b/var/spack/repos/builtin/packages/py-inquirer/package.py
new file mode 100644
index 0000000000..8d062fe675
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-inquirer/package.py
@@ -0,0 +1,21 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyInquirer(PythonPackage):
+    """Collection of common interactive command line user interfaces, based on Inquirer.js."""
+
+    homepage = "https://github.com/magmax/python-inquirer"
+    pypi = "inquirer/inquirer-3.1.3.tar.gz"
+
+    version("3.1.3", sha256="aac309406f5b49d4b8ab7c6872117f43bf082a552dc256aa16bc95e16bb58bec")
+
+    depends_on("python@3.8:", type=("build", "run"))
+    depends_on("py-poetry-core@1:", type="build")
+    depends_on("py-blessed@1.19:", type=("build", "run"))
+    depends_on("py-readchar@3.0.6:", type=("build", "run"))
+    depends_on("py-python-editor@1.0.4:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-lightning-api-access/package.py b/var/spack/repos/builtin/packages/py-lightning-api-access/package.py
new file mode 100644
index 0000000000..fbff25407a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-lightning-api-access/package.py
@@ -0,0 +1,22 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyLightningApiAccess(PythonPackage):
+    """Lightning Frontend Showing how a given API can be accessed."""
+
+    homepage = "https://github.com/Lightning-AI/LAI-API-Access-UI-Component"
+
+    # sdist not available on PyPI or GitHub
+    url = "https://files.pythonhosted.org/packages/py3/l/lightning-api-access/lightning_api_access-0.0.5-py3-none-any.whl"
+    list_url = "https://pypi.org/simple/lightning-api-access/"
+
+    version(
+        "0.0.5",
+        sha256="08657fee636377534332df92e0bee893d46cb877f9642cba09ce560aed95fd40",
+        expand=False,
+    )
diff --git a/var/spack/repos/builtin/packages/py-lightning-cloud/package.py b/var/spack/repos/builtin/packages/py-lightning-cloud/package.py
new file mode 100644
index 0000000000..b0799e3c5a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-lightning-cloud/package.py
@@ -0,0 +1,25 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyLightningCloud(PythonPackage):
+    """Lightning AI Command Line Interface."""
+
+    homepage = "https://lightning.ai/"
+    pypi = "lightning_cloud/lightning_cloud-0.5.31.tar.gz"
+
+    version("0.5.31", sha256="a5a138f4abbeffe66ee476fb9a8d621befac0434ffeeeec1cc00ccd3d72ffc09")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-click", type=("build", "run"))
+    depends_on("py-fastapi+all", type=("build", "run"))
+    depends_on("py-pyjwt", type=("build", "run"))
+    depends_on("py-requests", type=("build", "run"))
+    depends_on("py-rich", type=("build", "run"))
+    depends_on("py-six", type=("build", "run"))
+    depends_on("py-urllib3", type=("build", "run"))
+    depends_on("py-websocket-client", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-lightning-fabric/package.py b/var/spack/repos/builtin/packages/py-lightning-fabric/package.py
new file mode 100644
index 0000000000..53ed48fd81
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-lightning-fabric/package.py
@@ -0,0 +1,27 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyLightningFabric(PythonPackage):
+    """Fabric is the fast and lightweight way to scale PyTorch models without boilerplate."""
+
+    homepage = "https://github.com/Lightning-AI/lightning"
+    pypi = "lightning-fabric/lightning-fabric-2.0.0.tar.gz"
+
+    version("2.0.0", sha256="56ecf23e2857f76cc1ca4528cc314b884fed1541182d4e8b130e3c2efd39c896")
+
+    # src/lightning_fabric/__setup__.py
+    depends_on("python@3.8:", type=("build", "run"))
+    depends_on("py-setuptools", type="build")
+
+    # requirements/fabric/base.txt
+    depends_on("py-numpy@1.17.2:", type=("build", "run"))
+    depends_on("py-torch@1.11:", type=("build", "run"))
+    depends_on("py-fsspec@2021.06.1:+http", type=("build", "run"))
+    depends_on("py-packaging@17.1:", type=("build", "run"))
+    depends_on("py-typing-extensions@4:", type=("build", "run"))
+    depends_on("py-lightning-utilities@0.7:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-lightning/package.py b/var/spack/repos/builtin/packages/py-lightning/package.py
index 6eaeeff283..17dd427bbb 100644
--- a/var/spack/repos/builtin/packages/py-lightning/package.py
+++ b/var/spack/repos/builtin/packages/py-lightning/package.py
@@ -17,61 +17,61 @@ class PyLightning(PythonPackage):
     maintainers("adamjstewart")
 
     version("2.0.0", sha256="dfe158aa91ac139d8bdfccc7cdb627072e0052076ae9c0459c8fa12a028dbe6c")
-    version("1.9.4", sha256="842d81c48ed0684d2e33b4d815794f9c3b2adb3916446ed12556dfeb3952e721")
-    version("1.9.3", sha256="1d594b756d619b65ed61cf2fc17511819565ec94f70a49e797bd9b8e435d7c0c")
-    version("1.9.2", sha256="056bef8c9a5f3cfa82d07a65798a524d3a90fbb9e07d155f8da3194b24151593")
-    version("1.9.1", sha256="d13e4b364361ddb8d0380b41f069f13e6f8f6b10d6ed3c34ceafa7e6007d6007")
-    version("1.9.0", sha256="d002270e2cd6bdf239d6605f8ec7f6f79bd2ec4eb5e7758b38ca36c57d4d1fdf")
-    version("1.8.6", sha256="4f56a390e58551cf40173c8c74684972c261185f3a92690888340b7209855f49")
-    version("1.8.5", sha256="c54b2369a51c613ab4324c61c56af2d6100b9431ac0d7ae31c8d646561873eb4")
-    version("1.8.4", sha256="4f7746b406276449bd91b46c71eaf8823781322e56dec860316c74560e7e8551")
-    version("1.8.3", sha256="61b03b7858848ac01aea3d76679104bc651271697c40f13cc078ad4365594874")
-    version("1.8.2", sha256="f30e30b9eaa8a0986fbaec61734775ba349185ed17bd7f02caa2af4ff75e273e")
-    version("1.8.1", sha256="c0a5dda56f62efd807ccf18a2943fbf8ca60511f8afa63ec3ab1ebe79e43575c")
 
     variant(
         "extra", default=False, description="Install extra dependencies for full functionality"
     )
 
-    # src/pytorch_lightning/__setup__.py
-    depends_on("python@3.8:", when="@2:", type=("build", "run"))
+    # src/lightning/__setup__.py
+    depends_on("python@3.8:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
 
-    # requirements/pytorch/base.txt
-    depends_on("py-numpy@1.17.2:", type=("build", "run"))
-    depends_on("py-torch@1.11:", when="@2:", type=("build", "run"))
-    depends_on("py-torch@1.10:", when="@1.9:", type=("build", "run"))
-    depends_on("py-torch@1.9:", type=("build", "run"))
-    depends_on("py-tqdm@4.57.0:", type=("build", "run"))
-    depends_on("py-pyyaml@5.4:", type=("build", "run"))
-    depends_on("py-fsspec@2021.06.1:+http", type=("build", "run"))
-    depends_on("py-torchmetrics@0.7:", type=("build", "run"))
-    depends_on("py-packaging@17.1:", when="@1.9:", type=("build", "run"))
-    depends_on("py-packaging@17.0:", type=("build", "run"))
-    depends_on("py-typing-extensions@4:", type=("build", "run"))
-    depends_on("py-lightning-utilities@0.7:", when="@2:", type=("build", "run"))
-    depends_on("py-lightning-utilities@0.6.0.post0:", when="@1.9.1:", type=("build", "run"))
-    depends_on("py-lightning-utilities@0.4.2:", when="@1.9.0", type=("build", "run"))
-    depends_on("py-lightning-utilities@0.3,0.4.1:", when="@1.8.4:1.8", type=("build", "run"))
-    depends_on("py-lightning-utilities@0.3:", when="@1.8.0:1.8.3", type=("build", "run"))
+    # src/lightning.egg-info/requires.txt
+    depends_on("py-jinja2@:4", type=("build", "run"))
+    depends_on("py-pyyaml@5.4:7", type=("build", "run"))
+    depends_on("py-arrow@1.2:2", 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", 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.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-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-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-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"))
+    depends_on("py-typing-extensions@4:5", type=("build", "run"))
+    depends_on("py-urllib3@:2", type=("build", "run"))
+    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@2.0.0", when="@2.0.0", type=("build", "run"))
 
-    # requirements/pytorch/extra.txt
     with when("+extra"):
-        depends_on("py-matplotlib@3.2:", type=("build", "run"))
-        depends_on("py-omegaconf@2.0.5:", type=("build", "run"))
-        depends_on("py-hydra-core@1.0.5:", type=("build", "run"))
-        depends_on("py-jsonargparse@4.18:+signatures", when="@1.9:", type=("build", "run"))
-        depends_on("py-jsonargparse@4.15.2:+signatures", type=("build", "run"))
-        depends_on("py-rich@12.3:", when="@2:", type=("build", "run"))
-        depends_on("py-rich@10.14:", type=("build", "run"))
-        depends_on("py-tensorboardx@2.2:", when="@1.9:", type=("build", "run"))
-
-    # Historical dependencies
-    depends_on("py-lightning-lite@1.8.0", when="@1.8.0", type=("build", "run"))
-    depends_on("py-tensorboardx@2.2:", when="@1.8.3:1.8", type=("build", "run"))
-    depends_on("py-tensorboard@2.9.1:", when="@:1.8.2", type=("build", "run"))
-
-    # https://github.com/Lightning-AI/lightning/issues/16637
-    conflicts("^py-torch~distributed", when="@1.9.0")
-    # https://github.com/Lightning-AI/lightning/issues/15494
-    conflicts("^py-torch~distributed", when="@1.8.0")
+        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-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-redis@4.0.1:4", type=("build", "run"))
+        depends_on("py-rich@12.3:13", 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"))
diff --git a/var/spack/repos/builtin/packages/py-maturin/package.py b/var/spack/repos/builtin/packages/py-maturin/package.py
index 814a559f2d..5fe2c6b0a4 100644
--- a/var/spack/repos/builtin/packages/py-maturin/package.py
+++ b/var/spack/repos/builtin/packages/py-maturin/package.py
@@ -20,3 +20,4 @@ class PyMaturin(PythonPackage):
     depends_on("py-wheel@0.36.2:", type="build")
     depends_on("py-setuptools-rust@1.4:", type="build")
     depends_on("py-tomli@1.1:", when="^python@:3.10", type=("build", "run"))
+    depends_on("rust", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-orjson/package.py b/var/spack/repos/builtin/packages/py-orjson/package.py
new file mode 100644
index 0000000000..37b373d54d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-orjson/package.py
@@ -0,0 +1,17 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyOrjson(PythonPackage):
+    """Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy."""
+
+    homepage = "https://github.com/ijl/orjson"
+    pypi = "orjson/orjson-3.8.7.tar.gz"
+
+    version("3.8.7", sha256="8460c8810652dba59c38c80d27c325b5092d189308d8d4f3e688dbd8d4f3b2dc")
+
+    depends_on("py-maturin@0.13:0.14", type="build")
diff --git a/var/spack/repos/builtin/packages/py-panel/package.py b/var/spack/repos/builtin/packages/py-panel/package.py
new file mode 100644
index 0000000000..084feff5aa
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-panel/package.py
@@ -0,0 +1,27 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyPanel(PythonPackage):
+    """A high level app and dashboarding solution for Python."""
+
+    homepage = "http://panel.holoviz.org/"
+    pypi = "panel/panel-0.14.4.tar.gz"
+
+    version("0.14.4", sha256="b853d2f53d7738ec6372525360c5bf9427a71ed990685ccac703bc9b442e9951")
+
+    depends_on("py-param@1.12:", type=("build", "run"))
+    depends_on("py-pyct@0.4.4:", type=("build", "run"))
+    depends_on("py-setuptools@42:", type=("build", "run"))
+    depends_on("py-bokeh@2.4.3:2.4", type=("build", "run"))
+    depends_on("py-pyviz-comms@0.7.4:", type=("build", "run"))
+    depends_on("py-requests", type=("build", "run"))
+    depends_on("py-bleach", type=("build", "run"))
+    depends_on("py-packaging", type="build")
+    depends_on("py-tqdm@4.48:", type=("build", "run"))
+    depends_on("py-markdown", type=("build", "run"))
+    depends_on("py-typing-extensions", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pyviz-comms/package.py b/var/spack/repos/builtin/packages/py-pyviz-comms/package.py
new file mode 100644
index 0000000000..bd5bac7db2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pyviz-comms/package.py
@@ -0,0 +1,18 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyPyvizComms(PythonPackage):
+    """Bidirectional communication for the HoloViz ecosystem."""
+
+    homepage = "https://holoviz.org/"
+    pypi = "pyviz_comms/pyviz_comms-2.2.1.tar.gz"
+
+    version("2.2.1", sha256="a26145b8ce43d2d934b3c6826d77b913ce105c528eb2e494c890b3e3525ddf33")
+
+    depends_on("py-setuptools@40.8:60", type="build")
+    depends_on("py-param", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-readchar/package.py b/var/spack/repos/builtin/packages/py-readchar/package.py
new file mode 100644
index 0000000000..20f532d3bd
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-readchar/package.py
@@ -0,0 +1,17 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyReadchar(PythonPackage):
+    """Library to easily read single chars and key strokes."""
+
+    homepage = "https://github.com/magmax/python-readchar"
+    pypi = "readchar/readchar-4.0.5.tar.gz"
+
+    version("4.0.5", sha256="08a456c2d7c1888cde3f4688b542621b676eb38cd6cfed7eb6cb2e2905ddc826")
+
+    depends_on("py-setuptools@41:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-redis/package.py b/var/spack/repos/builtin/packages/py-redis/package.py
index 1bd03b69e2..b4a0681100 100644
--- a/var/spack/repos/builtin/packages/py-redis/package.py
+++ b/var/spack/repos/builtin/packages/py-redis/package.py
@@ -9,8 +9,10 @@ from spack.package import *
 class PyRedis(PythonPackage):
     """The Python interface to the Redis key-value store."""
 
+    homepage = "https://github.com/redis/redis-py"
     pypi = "redis/redis-3.3.8.tar.gz"
 
+    version("4.5.1", sha256="1eec3741cda408d3a5f84b78d089c8b8d895f21b3b050988351e925faf202864")
     version("3.5.3", sha256="0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2")
     version("3.5.0", sha256="7378105cd8ea20c4edc49f028581e830c01ad5f00be851def0f4bc616a83cd89")
     version("3.3.8", sha256="98a22fb750c9b9bb46e75e945dc3f61d0ab30d06117cbb21ff9cd1d315fedd3b")
@@ -21,7 +23,10 @@ class PyRedis(PythonPackage):
         description="Support for hiredis which speeds up parsing of multi bulk replies",
     )
 
-    depends_on("python@2.7:2.8,3.4:", when="@3.3.0:3.3", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", when="@3.4.0:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
+    depends_on("py-importlib-metadata@1:", when="@4: ^python@:3.7", type=("build", "run"))
+    depends_on("py-typing-extensions", when="@4: ^python@:3.7", type=("build", "run"))
+    depends_on("py-async-timeout@4.0.2:", when="@4:", type=("build", "run"))
+
+    depends_on("py-hiredis@1:", when="@4: +hiredis", type=("build", "run"))
     depends_on("py-hiredis@0.1.3:", when="+hiredis", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-s3fs/package.py b/var/spack/repos/builtin/packages/py-s3fs/package.py
index 1a95c5fa59..0545ce7844 100644
--- a/var/spack/repos/builtin/packages/py-s3fs/package.py
+++ b/var/spack/repos/builtin/packages/py-s3fs/package.py
@@ -13,9 +13,12 @@ class PyS3fs(PythonPackage):
     homepage = "https://s3fs.readthedocs.io/en/latest/"
     pypi = "s3fs/s3fs-0.5.2.tar.gz"
 
+    version("2022.11.0", sha256="10c5ac283a4f5b67ffad6d1f25ff7ee026142750c5c5dc868746cd904f617c33")
     version("0.5.2", sha256="87e5210415db17b9de18c77bcfc4a301570cc9030ee112b77dc47ab82426bae1")
 
-    depends_on("python@3.7:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-aiobotocore@1.0.1:", type=("build", "run"))
-    depends_on("py-fsspec@0.8.0:", type=("build", "run"))
+    depends_on("py-aiobotocore@2.4", when="@2022:", type=("build", "run"))
+    depends_on("py-aiobotocore@1.0.1:", when="@:0", type=("build", "run"))
+    depends_on("py-fsspec@2022.11.0", when="@2022.11.0", type=("build", "run"))
+    depends_on("py-fsspec@0.8.0:", when="@0", type=("build", "run"))
+    depends_on("py-aiohttp", when="@2022:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-starsessions/package.py b/var/spack/repos/builtin/packages/py-starsessions/package.py
new file mode 100644
index 0000000000..f52e039c06
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-starsessions/package.py
@@ -0,0 +1,21 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyStarsessions(PythonPackage):
+    """Advanced sessions for Starlette and FastAPI frameworks."""
+
+    homepage = "https://github.com/alex-oleshkevich/starsessions"
+    pypi = "starsessions/starsessions-2.1.1.tar.gz"
+
+    version("2.1.1", sha256="cb250de84ebc6159ad187cab69e6fe60eab11684b40349457e74dcfb7656c805")
+    version("1.3.0", sha256="8d3b509d4e6d235655f7dd495fcf0afc1bd86da84de3a8d434e6f82137ebcde8")
+
+    depends_on("python@3.8:3", when="@2:", type=("build", "run"))
+    depends_on("py-poetry-core@1:", type="build")
+    depends_on("py-starlette@0", type=("build", "run"))
+    depends_on("py-itsdangerous@2.0.1:2", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-streamlit/package.py b/var/spack/repos/builtin/packages/py-streamlit/package.py
new file mode 100644
index 0000000000..4e562c8522
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-streamlit/package.py
@@ -0,0 +1,39 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyStreamlit(PythonPackage):
+    """The fastest way to build data apps in Python."""
+
+    homepage = "https://streamlit.io/"
+    pypi = "streamlit/streamlit-1.20.0.tar.gz"
+
+    version("1.20.0", sha256="f6e257e033a2532ce9b37c425717a4e885fa4d0e339fa5dcdbbda8d75ec191e9")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-altair@3.2:4", type=("build", "run"))
+    depends_on("py-blinker@1:", type=("build", "run"))
+    depends_on("py-cachetools@4:", type=("build", "run"))
+    depends_on("py-click@7:", type=("build", "run"))
+    depends_on("py-importlib-metadata@1.4:", type=("build", "run"))
+    depends_on("py-numpy", type=("build", "run"))
+    depends_on("py-packaging@14.1:", type=("build", "run"))
+    depends_on("py-pandas@0.25:1", type=("build", "run"))
+    depends_on("pil@6.2:", type=("build", "run"))
+    depends_on("py-protobuf@3.12:3", type=("build", "run"))
+    depends_on("py-pyarrow@4:", type=("build", "run"))
+    depends_on("py-pympler@0.9:", type=("build", "run"))
+    depends_on("py-python-dateutil", type=("build", "run"))
+    depends_on("py-requests@2.4:", type=("build", "run"))
+    depends_on("py-rich@10.11:", type=("build", "run"))
+    depends_on("py-semver", type=("build", "run"))
+    depends_on("py-toml", type=("build", "run"))
+    depends_on("py-typing-extensions@3.10:", type=("build", "run"))
+    depends_on("py-tzlocal@1.1:", type=("build", "run"))
+    depends_on("py-validators@0.2:", type=("build", "run"))
+    depends_on("py-watchdog", when="platform=linux", type=("build", "run"))
+    depends_on("py-watchdog", when="platform=windows", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-ujson/package.py b/var/spack/repos/builtin/packages/py-ujson/package.py
index ae6f8c60c1..c10c4c43dd 100644
--- a/var/spack/repos/builtin/packages/py-ujson/package.py
+++ b/var/spack/repos/builtin/packages/py-ujson/package.py
@@ -13,9 +13,11 @@ class PyUjson(PythonPackage):
     homepage = "https://github.com/esnme/ultrajson"
     pypi = "ujson/ujson-1.35.tar.gz"
 
+    version("5.7.0", sha256="e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23")
     version("4.0.2", sha256="c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d")
     version("1.35", sha256="f66073e5506e91d204ab0c614a148d5aa938bdbf104751be66f8ad7a222f5f86")
 
-    depends_on("python@3.6:", type=("build", "run"), when="@4:")
+    depends_on("py-setuptools@42:", when="@5:", type="build")
     depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools-scm", type="build", when="@4:")
+    depends_on("py-setuptools-scm@3.4:+toml", when="@5:", type="build")
+    depends_on("py-setuptools-scm", when="@4:", type="build")
diff --git a/var/spack/repos/builtin/packages/py-uvicorn/package.py b/var/spack/repos/builtin/packages/py-uvicorn/package.py
index a534ce066e..74204a8884 100644
--- a/var/spack/repos/builtin/packages/py-uvicorn/package.py
+++ b/var/spack/repos/builtin/packages/py-uvicorn/package.py
@@ -15,9 +15,20 @@ class PyUvicorn(PythonPackage):
 
     version("0.20.0", sha256="a4e12017b940247f836bc90b72e725d7dfd0c8ed1c51eb365f5ba30d9f5127d8")
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-hatchling", type="build")
+    variant("standard", default=False, description="Build standard dependencies")
 
+    depends_on("py-hatchling", type="build")
     depends_on("py-click@7.0:", type=("build", "run"))
     depends_on("py-h11@0.8:", type=("build", "run"))
     depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))
+
+    with when("+standard"):
+        depends_on("py-colorama@0.4:", when="platform=windows", type=("build", "run"))
+        depends_on("py-httptools@0.5:", type=("build", "run"))
+        depends_on("py-python-dotenv@0.13:", type=("build", "run"))
+        depends_on("py-pyyaml@5.1:", type=("build", "run"))
+        depends_on("py-uvloop@0.14,0.15.2:", when="platform=linux", type=("build", "run"))
+        depends_on("py-uvloop@0.14,0.15.2:", when="platform=darwin", type=("build", "run"))
+        depends_on("py-uvloop@0.14,0.15.2:", when="platform=cray", type=("build", "run"))
+        depends_on("py-watchfiles@0.13:", type=("build", "run"))
+        depends_on("py-websockets@10.4:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-validators/package.py b/var/spack/repos/builtin/packages/py-validators/package.py
new file mode 100644
index 0000000000..41a69dd353
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-validators/package.py
@@ -0,0 +1,18 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyValidators(PythonPackage):
+    """Python Data Validation for Humans."""
+
+    homepage = "https://github.com/kvesteri/validators"
+    pypi = "validators/validators-0.20.0.tar.gz"
+
+    version("0.20.0", sha256="24148ce4e64100a2d5e267233e23e7afeb55316b47d30faae7eb6e7292bc226a")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-decorator@3.4:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-watchfiles/package.py b/var/spack/repos/builtin/packages/py-watchfiles/package.py
new file mode 100644
index 0000000000..80fc72489c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-watchfiles/package.py
@@ -0,0 +1,18 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyWatchfiles(PythonPackage):
+    """Simple, modern and high performance file watching and code reload in python."""
+
+    homepage = "https://github.com/samuelcolvin/watchfiles"
+    pypi = "watchfiles/watchfiles-0.18.1.tar.gz"
+
+    version("0.18.1", sha256="4ec0134a5e31797eb3c6c624dbe9354f2a8ee9c720e0b46fc5b7bab472b7c6d4")
+
+    depends_on("py-maturin@0.13", type="build")
+    depends_on("py-anyio@3:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-websockets/package.py b/var/spack/repos/builtin/packages/py-websockets/package.py
index ada62e03f7..9c091ae24b 100644
--- a/var/spack/repos/builtin/packages/py-websockets/package.py
+++ b/var/spack/repos/builtin/packages/py-websockets/package.py
@@ -12,12 +12,11 @@ class PyWebsockets(PythonPackage):
     clients in Python with a focus on correctness and simplicity."""
 
     homepage = "https://github.com/aaugustin/websockets"
-    url = "https://github.com/aaugustin/websockets/archive/8.1.tar.gz"
+    pypi = "websockets/websockets-10.4.tar.gz"
 
-    version("10.3", sha256="f13384865a14e0beff240b8f835b5b6a105b32928854841f167d920b4be8e75e")
+    version("10.4", sha256="eef610b23933c54d5d921c92578ae5f89813438fded840c2e9809d378dc765d3")
+    version("10.3", sha256="fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4")
     version("10.1", sha256="181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d")
-    version("8.1", sha256="c19ce96ad5f7606127d3915364144df93fb865a215784b06048fae3d39364f14")
+    version("8.1", sha256="5c65d2da8c6bce0fca2528f69f44b2f977e06954c8512a952222cea50dad430f")
 
     depends_on("py-setuptools", type="build")
-    depends_on("python@3.6.1:", type=("build", "run"))
-    depends_on("python@3.7:", type=("build", "run"), when="@10.1:")
-- 
cgit v1.2.3-60-g2f50