Update various Jupyter packages (#36332)

* Update various Jupyter packages
* Fix missing versions

24 files changed, 104 insertions, 76 deletions

diff --git a/var/spack/repos/builtin/packages/py-appnope/package.py b/var/spack/repos/builtin/packages/py-appnope/package.py
index af8ee0bfae..d5d83383a9 100644
--- a/var/spack/repos/builtin/packages/py-appnope/package.py
+++ b/var/spack/repos/builtin/packages/py-appnope/package.py
@@ -12,7 +12,7 @@ class PyAppnope(PythonPackage):
     homepage = "https://github.com/minrk/appnope"
     pypi = "appnope/appnope-0.1.0.tar.gz"
 
+    version("0.1.3", sha256="02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24")
     version("0.1.0", sha256="8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71")
 
-    # pip silently replaces distutils with setuptools
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-attrs/package.py b/var/spack/repos/builtin/packages/py-attrs/package.py
index 43d93a2611..2dfd716292 100644
--- a/var/spack/repos/builtin/packages/py-attrs/package.py
+++ b/var/spack/repos/builtin/packages/py-attrs/package.py
@@ -13,6 +13,7 @@ class PyAttrs(PythonPackage):
     pypi = "attrs/attrs-20.3.0.tar.gz"
     git = "https://github.com/python-attrs/attrs"
 
+    version("22.2.0", sha256="c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99")
     version("22.1.0", sha256="29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6")
     version("21.4.0", sha256="626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd")
     version("21.2.0", sha256="ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb")
@@ -25,8 +26,5 @@ class PyAttrs(PythonPackage):
     version("18.1.0", sha256="e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b")
     version("16.3.0", sha256="80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc")
 
-    depends_on("python@3.5:", when="@22.1.0:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", when="@21.2.0:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
     depends_on("py-setuptools@40.6.0:", when="@19.1.0:", type="build")
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-comm/package.py b/var/spack/repos/builtin/packages/py-comm/package.py
new file mode 100644
index 0000000000..fd195b1f4f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-comm/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 PyComm(PythonPackage):
+    """Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc."""
+
+    homepage = "https://github.com/ipython/comm"
+    pypi = "comm/comm-0.1.3.tar.gz"
+
+    version("0.1.3", sha256="a61efa9daffcfbe66fd643ba966f846a624e4e6d6767eda9cf6e993aadaab93e")
+
+    depends_on("py-hatchling@1.10:", type="build")
+    depends_on("py-traitlets@5.3:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-debugpy/package.py b/var/spack/repos/builtin/packages/py-debugpy/package.py
index fab88c7ace..d7ab0c91e2 100644
--- a/var/spack/repos/builtin/packages/py-debugpy/package.py
+++ b/var/spack/repos/builtin/packages/py-debugpy/package.py
@@ -15,10 +15,9 @@ class PyDebugpy(PythonPackage):
     # 'debugpy._vendored' requires additional dependencies, Windows-specific
     skip_modules = ["debugpy._vendored"]
 
+    version("1.6.6", sha256="b9c2130e1c632540fbf9c2c88341493797ddf58016e7cba02e311de9b0a96b67")
     version("1.6.3", sha256="e8922090514a890eec99cfb991bab872dd2e353ebb793164d5f01c362b9a40bf")
     version("1.5.1", sha256="d2b09e91fbd1efa4f4fda121d49af89501beda50c18ed7499712c71a4bf3452e")
     version("1.4.1", sha256="889316de0b8ff3732927cb058cfbd3371e4cd0002ecc170d34c755ad289c867c")
 
-    depends_on("python@3.7:", when="@1.6:", type=("build", "link", "run"))
-    depends_on("python@2.7:2.8,3.5:", type=("build", "link", "run"))
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-fastjsonschema/package.py b/var/spack/repos/builtin/packages/py-fastjsonschema/package.py
index 361e08326a..15a458ede5 100644
--- a/var/spack/repos/builtin/packages/py-fastjsonschema/package.py
+++ b/var/spack/repos/builtin/packages/py-fastjsonschema/package.py
@@ -13,6 +13,7 @@ class PyFastjsonschema(PythonPackage):
     homepage = "https://github.com/horejsek/python-fastjsonschema"
     pypi = "fastjsonschema/fastjsonschema-2.15.1.tar.gz"
 
+    version("2.16.3", sha256="4a30d6315a68c253cfa8f963b9697246315aa3db89f98b97235e345dedfb0b8e")
     version("2.16.2", sha256="01e366f25d9047816fe3d288cbfc3e10541daf0af2044763f3d0ade42476da18")
     version("2.15.1", sha256="671f36d225b3493629b5e789428660109528f373cf4b8a22bac6fa2f8191c2d2")
 
diff --git a/var/spack/repos/builtin/packages/py-greenlet/package.py b/var/spack/repos/builtin/packages/py-greenlet/package.py
index 2da5a41b48..01dae7356a 100644
--- a/var/spack/repos/builtin/packages/py-greenlet/package.py
+++ b/var/spack/repos/builtin/packages/py-greenlet/package.py
@@ -12,12 +12,12 @@ class PyGreenlet(PythonPackage):
     homepage = "https://github.com/python-greenlet/greenlet"
     pypi = "greenlet/greenlet-0.4.17.tar.gz"
 
+    version("2.0.2", sha256="e7c8dc13af7db097bed64a051d2dd49e9f0af495c26995c00a9ee842690d34c0")
     version("1.1.3", sha256="bcb6c6dd1d6be6d38d6db283747d07fda089ff8c559a835236560a4410340455")
     version("1.1.2", sha256="e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a")
     version("1.1.0", sha256="c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee")
     version("0.4.17", sha256="41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b")
     version("0.4.13", sha256="0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4")
 
-    depends_on("python@2.7:2.8,3.5:", when="@1:", type=("build", "link", "run"))
-    depends_on("python", when="@:0.9", type=("build", "link", "run"))
+    depends_on("python", type=("build", "link", "run"))
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-hatch-vcs/package.py b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py
index bad304e745..10e05abbd2 100644
--- a/var/spack/repos/builtin/packages/py-hatch-vcs/package.py
+++ b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py
@@ -12,7 +12,9 @@ class PyHatchVcs(PythonPackage):
     homepage = "https://github.com/ofek/hatch-vcs"
     pypi = "hatch_vcs/hatch_vcs-0.2.0.tar.gz"
 
+    version("0.3.0", sha256="cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee")
     version("0.2.0", sha256="9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff")
 
+    depends_on("py-hatchling@1.1:", when="@0.3:", type=("build", "run"))
     depends_on("py-hatchling@0.21.0:", type=("build", "run"))
     depends_on("py-setuptools-scm@6.4.0:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-hatchling/package.py b/var/spack/repos/builtin/packages/py-hatchling/package.py
index 0b4f1204ff..9a8dce07c8 100644
--- a/var/spack/repos/builtin/packages/py-hatchling/package.py
+++ b/var/spack/repos/builtin/packages/py-hatchling/package.py
@@ -13,12 +13,11 @@ class PyHatchling(PythonPackage):
     pypi = "hatchling/hatchling-1.4.1.tar.gz"
     git = "https://github.com/pypa/hatch"
 
+    version("1.13.0", sha256="f8d275a2cc720735286b7c2e2bc35da05761e6d3695c2fa416550395f10c53c7")
     version("1.10.0", sha256="5d31f43dffaf6265c808e1b5353662ffa5146d844278b55caa6c7f74f427ec50")
     version("1.8.1", sha256="448b04b23faed669b2b565b998ac955af4feea66c5deed3a1212ac9399d2e1cd")
     version("1.4.1", sha256="13461b42876ade4f75ee5d2a2c656b288ca0aab7f048ef66657ef166996b2118")
 
-    # dependencies found in backend/src/hatchling/ouroboros.py
-    depends_on("python@3.7:", type=("build", "run"))
     depends_on("py-editables@0.3:", type=("build", "run"))
     depends_on("py-importlib-metadata", when="^python@:3.7", type=("build", "run"))
     depends_on("py-packaging@21.3:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py
index 8876030378..05c23d740a 100644
--- a/var/spack/repos/builtin/packages/py-ipykernel/package.py
+++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py
@@ -13,6 +13,7 @@ class PyIpykernel(PythonPackage):
     homepage = "https://github.com/ipython/ipykernel"
     pypi = "ipykernel/ipykernel-5.3.4.tar.gz"
 
+    version("6.22.0", sha256="302558b81f1bc22dc259fb2a0c5c7cf2f4c0bdb21b50484348f7bafe7fb71421")
     version("6.16.0", sha256="7fe42c0d58435e971dc15fd42189f20d66bf35f3056bda4f6554271bc1fa3d0d")
     version("6.15.2", sha256="e7481083b438609c9c8a22d6362e8e1bc6ec94ba0741b666941e634f2d61bdf3")
     version("6.9.1", sha256="f95070a2dfd3147f8ab19f18ee46733310813758593745e07ec18fb08b409f1d")
@@ -36,20 +37,18 @@ class PyIpykernel(PythonPackage):
     version("4.1.1", sha256="d8c5555386d0f18f1336dea9800f9f0fe96dcecc9757c0f980e11fdfadb661ff")
     version("4.1.0", sha256="e0e150ad55e487e49054efc9a4b0e2e17f27e1de77444b26760789077b146d86")
 
-    depends_on("python@3.7:", when="@6.0:", type=("build", "run"))
-    depends_on("python@3.5:", when="@5.2:", type=("build", "run"))
-    depends_on("python@3.4:", when="@5.0:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.3:", type=("build", "run"))
+    depends_on("python@3.8:", when="@6.22:", type=("build", "run"))
     depends_on("py-hatchling@1.4:", when="@6.13.1:", type="build")
-    depends_on("py-setuptools", when="@5:6.13.0", type="build")
-    depends_on("py-jupyter-core@4.2:", when="@5:6.13.0", type="build")
 
+    depends_on("py-debugpy@1.6.5:", when="@6.22:", type=("build", "run"))
     depends_on("py-debugpy@1:", when="@6.11:", type=("build", "run"))
     depends_on("py-debugpy@1.0:1", when="@6:6.10", type=("build", "run"))
     depends_on("py-ipython@7.23.1:", when="@6.5.1:", type=("build", "run"))
     depends_on("py-ipython@7.23.1:7", when="@6.0.0:6.5.0", type=("build", "run"))
     depends_on("py-ipython@5.0:", when="@5", type=("build", "run"))
     depends_on("py-ipython@4.0:", when="@:4", type=("build", "run"))
+    depends_on("py-comm@0.1.1:", when="@6.22:", type=("build", "run"))
+    depends_on("py-traitlets@5.4:", when="@6.22:", type=("build", "run"))
     depends_on("py-traitlets@5.1:", when="@6.11:", type=("build", "run"))
     depends_on("py-traitlets@5.1.0:5", when="@6.5:6.10", type=("build", "run"))
     depends_on("py-traitlets@4.1.0:5", when="@6.0:6.4", type=("build", "run"))
@@ -58,6 +57,8 @@ class PyIpykernel(PythonPackage):
     depends_on("py-jupyter-client@:7", when="@6.2:6.10", type=("build", "run"))
     depends_on("py-jupyter-client@:6", when="@6.0.2:6.1", type=("build", "run"))
     depends_on("py-jupyter-client", type=("build", "run"))
+    depends_on("py-jupyter-core@4.12:", when="@6.22:", type=("build", "run"))
+    depends_on("py-nest-asyncio", when="@6.6.1:", type=("build", "run"))
     depends_on("py-tornado@6.1:", when="@6.11:", type=("build", "run"))
     depends_on("py-tornado@5:6", when="@6.10", type=("build", "run"))
     depends_on("py-tornado@4.2:6", when="@6:6.9", type=("build", "run"))
@@ -66,12 +67,16 @@ class PyIpykernel(PythonPackage):
     depends_on("py-matplotlib-inline@0.1:", when="@6.11:", type=("build", "run"))
     depends_on("py-matplotlib-inline@0.1.0:0.1", when="@6:6.10", type=("build", "run"))
     depends_on("py-appnope", when="@5.1.3: platform=darwin", type=("build", "run"))
+    depends_on("py-pyzmq@20:", when="@6.22:", type=("build", "run"))
     depends_on("py-pyzmq@17:", when="@6.15:", type=("build", "run"))
     depends_on("py-psutil", when="@6.9.2:", type=("build", "run"))
-    depends_on("py-nest-asyncio", when="@6.6.1:", type=("build", "run"))
     depends_on("py-packaging", when="@6.12:", type=("build", "run"))
 
-    # old
+    conflicts("^py-jupyter-core@5.0")
+
+    # Historical dependencies
+    depends_on("py-setuptools", when="@5:6.13.0", type="build")
+    depends_on("py-jupyter-core@4.2:", when="@5:6.13.0", type="build")
     depends_on("py-ipython-genutils", when="@6.3.1:6.4", type=("build", "run"))
     depends_on("py-ipython-genutils", when="@5.5.6", type=("build", "run"))
     depends_on("py-importlib-metadata@:4", when="@6.1:6.6 ^python@:3.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py
index a40b595bb4..f94c0f1946 100644
--- a/var/spack/repos/builtin/packages/py-ipython/package.py
+++ b/var/spack/repos/builtin/packages/py-ipython/package.py
@@ -20,6 +20,7 @@ class PyIpython(PythonPackage):
     # for py-ipython@8: "IPython.kernel" was removed
     skip_modules = ["IPython.kernel"]
 
+    version("8.11.0", sha256="735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04")
     version("8.5.0", sha256="097bdf5cd87576fd066179c9f7f208004f7a6864ee1b20f37d346c0bcb099f84")
     version("8.0.1", sha256="ab564d4521ea8ceaac26c3a2c6e5ddbca15c8848fd5a5cc325f960da88d42974")
     version("7.31.1", sha256="b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c")
@@ -44,11 +45,6 @@ class PyIpython(PythonPackage):
     )
 
     depends_on("python@3.8:", when="@8:", type=("build", "run"))
-    depends_on("python@3.7:", when="@7.17:", type=("build", "run"))
-    depends_on("python@3.6:", when="@7.10:", type=("build", "run"))
-    depends_on("python@3.5:", when="@7:", type=("build", "run"))
-    depends_on("python@3.3:", when="@6:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.3:", type=("build", "run"))
     depends_on("py-setuptools@51:", when="@8:", type="build")
     depends_on("py-setuptools@18.5:", when="@4.1:7", type="run")
     depends_on("py-setuptools", type="build")
@@ -67,6 +63,7 @@ class PyIpython(PythonPackage):
     depends_on("py-pexpect", when="@4: platform=darwin", type=("build", "run"))
     depends_on("py-pexpect", when="@4: platform=cray", type=("build", "run"))
     depends_on("py-pickleshare", when="@4:", type=("build", "run"))
+    depends_on("py-prompt-toolkit@3.0.30:3.0.36,3.0.38:3.0", when="@8.11:", type=("build", "run"))
     depends_on("py-prompt-toolkit@3.0.2:3.0", when="@8.5:", type=("build", "run"))
     depends_on("py-prompt-toolkit@2.0.0:2,3.0.2:3.0", when="@7.26:", type=("build", "run"))
     depends_on("py-prompt-toolkit@3.0.2:3.0", when="@7.18:7.25", type=("build", "run"))
@@ -81,5 +78,6 @@ class PyIpython(PythonPackage):
     depends_on("py-traitlets@4.2:", when="@5:", type=("build", "run"))
     depends_on("py-traitlets", when="@4:", type=("build", "run"))
 
+    # Historical dependencies
     depends_on("py-black", when="@8.0", type=("build", "run"))
     depends_on("py-simplegeneric@0.8:", when="@4:7.0.0", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py
index 2233691d7d..3a6d205b87 100644
--- a/var/spack/repos/builtin/packages/py-jsonschema/package.py
+++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py
@@ -12,6 +12,7 @@ class PyJsonschema(PythonPackage):
     homepage = "https://github.com/Julian/jsonschema"
     pypi = "jsonschema/jsonschema-3.2.0.tar.gz"
 
+    version("4.17.3", sha256="0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d")
     version("4.16.0", sha256="165059f076eff6971bae5b742fc029a7b4ef3f9bcf04c14e4776a7605de14b23")
     version("4.10.0", sha256="8ff7b44c6a99c6bfd55ca9ac45261c649cefd40aaba1124c29aaef1bcb378d84")
     version("4.4.0", sha256="636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83")
@@ -22,27 +23,25 @@ class PyJsonschema(PythonPackage):
     version("2.6.0", sha256="6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02")
     version("2.5.1", sha256="36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41")
 
-    depends_on("python@3.7:", when="@4:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", when="@3:", type=("build", "run"))
-    depends_on("python@2.6:2.8,3.4:", type=("build", "run"))
-
     depends_on("py-hatchling", when="@4.10:", type="build")
     depends_on("py-hatch-vcs", when="@4.10:", type="build")
     depends_on("py-hatch-fancy-pypi-readme", when="@4.11:", type="build")
-    depends_on("py-setuptools@40.6.0:", when="@4:4.4", type="build")
-    depends_on("py-setuptools", when="@3", type=("build", "run"))
-    depends_on("py-setuptools", when="@:2", type="build")
-    depends_on("py-vcversioner", when="@:2", type="build")
-    depends_on("py-setuptools-scm+toml@3.4:", when="@4.4.0", type="build")
-    depends_on("py-setuptools-scm", when="@3", type="build")
 
     depends_on("py-attrs@17.4:", when="@3:", type=("build", "run"))
-    depends_on("py-pyrsistent@0.14:0.16,0.17.3:", when="@4:", type=("build", "run"))
-    depends_on("py-pyrsistent@0.14:", when="@3", type=("build", "run"))
+    depends_on("py-pyrsistent@0.14:", when="@3:", type=("build", "run"))
     depends_on("py-importlib-metadata", when="@3.1.1: ^python@:3.7", type=("build", "run"))
     depends_on("py-typing-extensions", when="@4.3: ^python@:3.7", type=("build", "run"))
     depends_on("py-importlib-resources@1.4:", when="@4.2.1: ^python@:3.8", type=("build", "run"))
     depends_on("py-importlib-resources", when="@4.2.0 ^python@:3.8", type=("build", "run"))
     depends_on("py-pkgutil-resolve-name@1.3.10:", when="@4.10.0: ^python@:3.8")
 
+    # Historical dependencies
+    depends_on("py-setuptools@40.6.0:", when="@4:4.4", type="build")
+    depends_on("py-setuptools", when="@3", type=("build", "run"))
+    depends_on("py-setuptools", when="@:2", type="build")
+    depends_on("py-vcversioner", when="@:2", type="build")
+    depends_on("py-setuptools-scm+toml@3.4:", when="@4.4.0", type="build")
+    depends_on("py-setuptools-scm", when="@3", type="build")
     depends_on("py-six@1.11:", when="@3", type=("build", "run"))
+
+    conflicts("^py-pyrsistent@0.17.0:0.17.2")
diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py
index 7c9b31819b..d544fc46fa 100644
--- a/var/spack/repos/builtin/packages/py-jupyter-core/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py
@@ -13,6 +13,7 @@ class PyJupyterCore(PythonPackage):
     pypi = "jupyter-core/jupyter_core-4.6.0.tar.gz"
     git = "https://github.com/jupyter/jupyter_core.git"
 
+    version("5.3.0", sha256="6db75be0c83edbf1b7c9f91ec266a9a24ef945da630f3120e1a0046dc13713fc")
     version("5.1.0", sha256="a5ae7c09c55c0b26f692ec69323ba2b62e8d7295354d20f6cd57b749de4a05bf")
     version("4.11.1", sha256="2e5f244d44894c4154d06aeae3419dd7f1b0ef4494dc5584929b398c61cfd314")
     version("4.9.2", sha256="d69baeb9ffb128b8cd2657fcf2703f89c769d1673c851812119e3a2a0e93ad9a")
@@ -33,14 +34,12 @@ class PyJupyterCore(PythonPackage):
     version("4.0.0", sha256="9025208cdfc40718c7e3ab62b5e17aacf68e3fc66e34ff21fe032d553620122a")
 
     depends_on("python@3.8:", when="@5:", type=("build", "run"))
-    depends_on("python@3.7:", when="@4.11.1:", type=("build", "run"))
-    depends_on("python@3.6:", when="@4.7:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", when="@4.6.2:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.3:", type=("build", "run"))
-    depends_on("py-setuptools", when="@:4.9.2", type=("build", "run"))
     depends_on("py-hatchling@1.4:", when="@4.11.1:", type="build")
 
     depends_on("py-platformdirs@2.5:", when="@5.1:", type=("build", "run"))
     depends_on("py-traitlets@5.3:", when="@5.1:", type=("build", "run"))
     depends_on("py-traitlets", type=("build", "run"))
-    # additional pywin32>=1.0 dependency for windows
+    # additional pywin32>=300 dependency for windows
+
+    # Historical dependencies
+    depends_on("py-setuptools", when="@:4.9.2", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py
index a7a386d582..d8ad51a5f5 100644
--- a/var/spack/repos/builtin/packages/py-nbformat/package.py
+++ b/var/spack/repos/builtin/packages/py-nbformat/package.py
@@ -13,6 +13,7 @@ class PyNbformat(PythonPackage):
     homepage = "https://github.com/jupyter/nbformat"
     pypi = "nbformat/nbformat-5.0.7.tar.gz"
 
+    version("5.8.0", sha256="46dac64c781f1c34dfd8acba16547024110348f9fc7eab0f31981c2a3dc48d1f")
     version("5.7.0", sha256="1d4760c15c1a04269ef5caf375be8b98dd2f696e5eb9e603ec2bf091f9b0d3f3")
     version("5.4.0", sha256="44ba5ca6acb80c5d5a500f1e5b83ede8cbe364d5a495c4c8cf60aaf1ba656501")
     version("5.1.3", sha256="b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8")
@@ -22,19 +23,18 @@ class PyNbformat(PythonPackage):
     version("4.0.1", sha256="5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5")
     version("4.0.0", sha256="daf9b990e96863d120aff123361156a316757757b81a8070eb6945e4a9774b2d")
 
-    depends_on("python@3.7:", when="@5.2:", type=("build", "run"))
-    depends_on("python@3.5:", when="@5:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.3:", when="@:4", type=("build", "run"))
     depends_on("py-hatchling@1.5:", when="@5.6:", type="build")
     depends_on("py-hatch-nodejs-version", when="@5.6:", type="build")
-    depends_on("py-setuptools@60:", when="@5.3:5.4", type="build")
-    depends_on("py-setuptools", when="@:5.4", type="build")
 
     depends_on("py-fastjsonschema", when="@5.3:", type=("build", "run"))
     depends_on("py-jsonschema@2.6:", when="@5.3:", type=("build", "run"))
-    depends_on("py-jsonschema@2.4.0:2.4,2.5.1:", type=("build", "run"))
+    depends_on("py-jsonschema@2.4,2.5.1:", type=("build", "run"))
     depends_on("py-jupyter-core", type=("build", "run"))
     depends_on("py-traitlets@5.1:", when="@5.4:", type=("build", "run"))
     depends_on("py-traitlets@4.1:", type=("build", "run"))
     depends_on("py-importlib-metadata@3.6:", when="@5.7: ^python@:3.7", type=("build", "run"))
+
+    # Historical dependencies
+    depends_on("py-setuptools@60:", when="@5.3:5.4", type="build")
+    depends_on("py-setuptools", when="@:5.4", type="build")
     depends_on("py-ipython-genutils", when="@:5.1", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-nest-asyncio/package.py b/var/spack/repos/builtin/packages/py-nest-asyncio/package.py
index 577aac4445..d39d0a6451 100644
--- a/var/spack/repos/builtin/packages/py-nest-asyncio/package.py
+++ b/var/spack/repos/builtin/packages/py-nest-asyncio/package.py
@@ -13,11 +13,11 @@ class PyNestAsyncio(PythonPackage):
     homepage = "https://github.com/erdewit/nest_asyncio"
     pypi = "nest-asyncio/nest_asyncio-1.4.0.tar.gz"
 
+    version("1.5.6", sha256="d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290")
     version("1.5.5", sha256="e442291cd942698be619823a17a86a5759eabe1f8613084790de189fe9e16d65")
     version("1.5.4", sha256="f969f6013a16fadb4adcf09d11a68a4f617c6049d7af7ac2c676110169a63abd")
     version("1.5.1", sha256="afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa")
     version("1.4.0", sha256="5773054bbc14579b000236f85bc01ecced7ffd045ec8ca4a9809371ec65a59c8")
 
-    depends_on("python@3.5:", type=("build", "run"))
     depends_on("py-setuptools@42:", type="build")
     depends_on("py-setuptools-scm@3.4.3: +toml", type="build")
diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py
index 4cdc01c47b..545c36b71d 100644
--- a/var/spack/repos/builtin/packages/py-platformdirs/package.py
+++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py
@@ -14,6 +14,7 @@ class PyPlatformdirs(PythonPackage):
     homepage = "https://github.com/platformdirs/platformdirs"
     pypi = "platformdirs/platformdirs-2.4.0.tar.gz"
 
+    version("3.1.1", sha256="024996549ee88ec1a9aa99ff7f8fc819bb59e2c3477b410d90a16d32d6e707aa")
     version("2.5.2", sha256="58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19")
     version("2.4.1", sha256="440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda")
     version("2.4.0", sha256="367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2")
@@ -27,11 +28,15 @@ class PyPlatformdirs(PythonPackage):
     )
 
     depends_on("python@3.7:", when="@2.4.1:", type=("build", "run"))
-    depends_on("python@3.6:", type=("build", "run"))
+    depends_on("py-hatch-vcs@0.3:", when="@3:", type="build")
+    depends_on("py-hatch-vcs", when="@2.5.2:", type="build")
+    depends_on("py-hatchling@1.12.2:", when="@3:", type="build")
+    depends_on("py-hatchling@0.22.0:", when="@2.5.2:", type="build")
+    depends_on("py-typing-extensions@4.4:", when="@3: ^python@:3.7", type=("build", "run"))
+
+    # Historical dependencies
     depends_on("py-setuptools@44:", when="@:2.5.1", type="build")
     depends_on("py-setuptools-scm@5:+toml", when="@:2.5.1", type="build")
-    depends_on("py-hatchling@0.22.0:", when="@2.5.2:", type="build")
-    depends_on("py-hatch-vcs", when="@2.5.2:", type="build")
 
 
 class PythonPipBuilder(spack.build_systems.python.PythonPipBuilder):
diff --git a/var/spack/repos/builtin/packages/py-psutil/package.py b/var/spack/repos/builtin/packages/py-psutil/package.py
index 886b06ecce..91d1ef58c7 100644
--- a/var/spack/repos/builtin/packages/py-psutil/package.py
+++ b/var/spack/repos/builtin/packages/py-psutil/package.py
@@ -14,6 +14,7 @@ class PyPsutil(PythonPackage):
     homepage = "https://github.com/giampaolo/psutil"
     pypi = "psutil/psutil-5.6.3.tar.gz"
 
+    version("5.9.4", sha256="3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62")
     version("5.9.2", sha256="feb861a10b6c3bb00701063b37e4afc754f8217f0f09c42280586bd6ac712b5c")
     version("5.8.0", sha256="0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6")
     version("5.7.2", sha256="90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb")
@@ -23,6 +24,10 @@ class PyPsutil(PythonPackage):
     version("5.4.5", sha256="ebe293be36bb24b95cdefc5131635496e88b17fabbcf1e4bc9b5c01f5e489cfe")
     version("5.0.1", sha256="9d8b7f8353a2b2eb6eb7271d42ec99d0d264a9338a37be46424d56b4e473b39e")
 
-    depends_on("python@2.6:2.8,3.4:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.4:", when="@5.9.2:", type=("build", "run"))
+    # pyproject.toml
+    depends_on("py-setuptools@43:", when="@5.9.4:", type="build")
     depends_on("py-setuptools", type="build")
+
+    # setup.py
+    # depends_on("py-pywin32", when="platform=windows", type=("build", "run"))
+    # depends_on("py-wmi", when="platform=windows", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pyrsistent/package.py b/var/spack/repos/builtin/packages/py-pyrsistent/package.py
index 6b6079f7b3..0eafffe5c5 100644
--- a/var/spack/repos/builtin/packages/py-pyrsistent/package.py
+++ b/var/spack/repos/builtin/packages/py-pyrsistent/package.py
@@ -14,14 +14,13 @@ class PyPyrsistent(PythonPackage):
     homepage = "https://github.com/tobgu/pyrsistent/"
     pypi = "pyrsistent/pyrsistent-0.15.7.tar.gz"
 
+    version("0.19.3", sha256="1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440")
     version("0.18.1", sha256="d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96")
     version("0.18.0", sha256="773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b")
     version("0.16.0", sha256="28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3")
     version("0.15.7", sha256="cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280")
 
-    depends_on("python@2.7:2.8,3.5:", type=("build", "link", "run"))
-    depends_on("python@3.6:", when="@0.18.0:", type=("build", "link", "run"))
-    depends_on("python@3.7:", when="@0.18.1:", type=("build", "link", "run"))
-    depends_on("py-setuptools", type="build")
+    depends_on("python", type=("build", "link", "run"))
     depends_on("py-setuptools@42:", when="@0.18.0:", type="build")
+    depends_on("py-setuptools", type="build")
     depends_on("py-six", when="@:0.17", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pyzmq/package.py b/var/spack/repos/builtin/packages/py-pyzmq/package.py
index 40c8df7025..6aec08c715 100644
--- a/var/spack/repos/builtin/packages/py-pyzmq/package.py
+++ b/var/spack/repos/builtin/packages/py-pyzmq/package.py
@@ -32,6 +32,7 @@ class PyPyzmq(PythonPackage):
         "zmq.devices",
     ]
 
+    version("25.0.2", sha256="6b8c1bbb70e868dc88801aa532cae6bd4e3b5233784692b786f17ad2962e5149")
     version("24.0.1", sha256="216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77")
     version("22.3.0", sha256="8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c")
     version("18.1.0", sha256="93f44739db69234c013a16990e43db1aa0af3cf5a4b8b377d028ff24515fbeb3")
@@ -40,23 +41,27 @@ class PyPyzmq(PythonPackage):
     version("16.0.2", sha256="0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d")
     version("14.7.0", sha256="77994f80360488e7153e64e5959dc5471531d1648e3a4bff14a714d074a38cc2")
 
-    depends_on("python@3.6:", type=("build", "run"), when="@22:")
-    depends_on("python@2.7,3.3:", type=("build", "run"), when="@18.1")
     # Python 3.9 build issues
     depends_on("python@2.7,3.3:3.8", type=("build", "run"), when="@16:18.0")
     depends_on("python@2.6:2.7,3.2:3.8", type=("build", "run"), when="@:14")
-    depends_on("py-cython@0.16:", type="build")
-    depends_on("py-cython@0.20:", type="build", when="@18:")
+
+    # pyproject.toml
+    depends_on("py-setuptools", type="build")
+    depends_on("py-packaging", type="build")
+
+    # setup.py
     depends_on("py-cython@0.29:", type="build", when="@22.3.0:")
-    depends_on("py-gevent", type=("build", "run"))
+    depends_on("py-cython@0.20:", type="build", when="@18:")
+    depends_on("py-cython@0.16:", type="build")
     depends_on("libzmq", type=("build", "link"))
     depends_on("libzmq@3.2:", type=("build", "link"), when="@22.3.0:")
-    depends_on("py-setuptools", type="build", when="@22.3.0:")
-    depends_on("py-packaging", type="build")
     # Only when python is provided by 'pypy'
     depends_on("py-py", type=("build", "run"), when="@:22")
     depends_on("py-cffi", type=("build", "run"), when="@:22")
 
+    # Undocumented dependencies
+    depends_on("py-gevent", type=("build", "run"))
+
     @run_before("install")
     def setup(self):
         """Create config file listing dependency information."""
diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py
index c5a6d65828..f61f453700 100644
--- a/var/spack/repos/builtin/packages/py-requests/package.py
+++ b/var/spack/repos/builtin/packages/py-requests/package.py
@@ -12,6 +12,7 @@ class PyRequests(PythonPackage):
     homepage = "http://python-requests.org"
     pypi = "requests/requests-2.24.0.tar.gz"
 
+    version("2.28.2", sha256="98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf")
     version("2.28.1", sha256="7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983")
     version("2.28.0", sha256="d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b")
     version("2.27.1", sha256="68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61")
diff --git a/var/spack/repos/builtin/packages/py-tenacity/package.py b/var/spack/repos/builtin/packages/py-tenacity/package.py
index 2a162cfe79..a88d272150 100644
--- a/var/spack/repos/builtin/packages/py-tenacity/package.py
+++ b/var/spack/repos/builtin/packages/py-tenacity/package.py
@@ -12,13 +12,13 @@ class PyTenacity(PythonPackage):
     homepage = "https://github.com/jd/tenacity"
     pypi = "tenacity/tenacity-6.3.1.tar.gz"
 
+    version("8.2.2", sha256="43af037822bd0029025877f3b2d97cc4d7bb0c2991000a3d59d71517c5c969e0")
     version("8.0.1", sha256="43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f")
     version("6.3.1", sha256="e14d191fb0a309b563904bbc336582efe2037de437e543b38da749769b544d7f")
 
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
-    depends_on("python@3.6:", type=("build", "run"), when="@8:")
-
     depends_on("py-setuptools@21:", type="build")
     depends_on("py-setuptools-scm@3.4:+toml", type="build")
 
     depends_on("py-six@1.9.0:", type=("build", "run"), when="@:7")
+
+    conflicts("^py-setuptools@24.0.0,34.0.0:34.0.3,34.1.0:34.1.1,34.2.0,34.3.0:34.3.2,36.2.0")
diff --git a/var/spack/repos/builtin/packages/py-tqdm/package.py b/var/spack/repos/builtin/packages/py-tqdm/package.py
index 397cfb03ac..1b1e35c747 100644
--- a/var/spack/repos/builtin/packages/py-tqdm/package.py
+++ b/var/spack/repos/builtin/packages/py-tqdm/package.py
@@ -12,6 +12,7 @@ class PyTqdm(PythonPackage):
     homepage = "https://github.com/tqdm/tqdm"
     pypi = "tqdm/tqdm-4.45.0.tar.gz"
 
+    version("4.65.0", sha256="1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5")
     version("4.64.1", sha256="5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4")
     version("4.64.0", sha256="40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d")
     version("4.62.3", sha256="d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d")
@@ -26,7 +27,6 @@ class PyTqdm(PythonPackage):
     variant("telegram", default=False, description="Enable Telegram bot support")
     variant("notebook", default=False, description="Enable Jupyter Notebook support")
 
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
     depends_on("py-setuptools@42:", type=("build", "run"))
     depends_on("py-setuptools-scm@3.4:+toml", type="build")
     depends_on("py-colorama", when="platform=windows", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py
index 5628840c16..5357109ddd 100644
--- a/var/spack/repos/builtin/packages/py-traitlets/package.py
+++ b/var/spack/repos/builtin/packages/py-traitlets/package.py
@@ -12,6 +12,7 @@ class PyTraitlets(PythonPackage):
     homepage = "https://github.com/ipython/traitlets"
     pypi = "traitlets/traitlets-5.0.4.tar.gz"
 
+    version("5.9.0", sha256="f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9")
     version("5.7.1", sha256="fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108")
     version("5.3.0", sha256="0bb9f1f9f017aa8ec187d8b1b2a7a6626a2a1d877116baba52a129bfa124f8e2")
     version("5.1.1", sha256="059f456c5a7c1c82b98c2e8c799f39c9b8128f6d0d46941ee118daace9eb70c7")
@@ -26,8 +27,6 @@ class PyTraitlets(PythonPackage):
     version("4.1.0", sha256="440e38dfa5d2a26c086d4b427cfb7aed17d0a2dca78bce90c33354da2592af5b")
     version("4.0.0", sha256="0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b")
 
-    depends_on("python@3.7:", when="@5:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.3:", type=("build", "run"))
     depends_on("py-hatchling@1.5:", when="@5.5:", type="build")
     depends_on("py-hatchling@0.25:", when="@5.2.1.post0:", type="build")
     depends_on("py-setuptools@40.8:", when="@:5.2.1.a", type="build")
diff --git a/var/spack/repos/builtin/packages/py-typing-extensions/package.py b/var/spack/repos/builtin/packages/py-typing-extensions/package.py
index 9f568beb54..f5d48d4c8d 100644
--- a/var/spack/repos/builtin/packages/py-typing-extensions/package.py
+++ b/var/spack/repos/builtin/packages/py-typing-extensions/package.py
@@ -15,6 +15,7 @@ class PyTypingExtensions(PythonPackage):
     homepage = "https://github.com/python/typing/tree/master/typing_extensions"
     pypi = "typing_extensions/typing_extensions-3.7.4.tar.gz"
 
+    version("4.5.0", sha256="5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb")
     version("4.3.0", sha256="e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6")
     version("4.2.0", sha256="f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376")
     version("4.1.1", sha256="1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42")
@@ -25,11 +26,5 @@ class PyTypingExtensions(PythonPackage):
     version("3.7.2", sha256="fb2cd053238d33a8ec939190f30cfd736c00653a85a2919415cecf7dc3d9da71")
     version("3.6.6", sha256="51e7b7f3dcabf9ad22eed61490f3b8d23d9922af400fe6656cb08e66656b701f")
 
-    # typing-extensions 4+ uses flit
-    depends_on("python@3.7:", when="@4.2:", type=("build", "run"))
-    depends_on("python@3.6:", when="@4:", type=("build", "run"))
     depends_on("py-flit-core@3.4:3", when="@4:", type="build")
-
-    # typing-extensions 3 uses setuptools
-    depends_on("python@2.7:2.8,3.4:", when="@:3", type=("build", "run"))
     depends_on("py-setuptools", when="@:3", type="build")
diff --git a/var/spack/repos/builtin/packages/py-zope-event/package.py b/var/spack/repos/builtin/packages/py-zope-event/package.py
index 3f60e8a14f..814be5490f 100644
--- a/var/spack/repos/builtin/packages/py-zope-event/package.py
+++ b/var/spack/repos/builtin/packages/py-zope-event/package.py
@@ -12,6 +12,7 @@ class PyZopeEvent(PythonPackage):
     homepage = "https://github.com/zopefoundation/zope.event"
     pypi = "zope.event/zope.event-4.3.0.tar.gz"
 
+    version("4.6", sha256="81d98813046fc86cc4136e3698fee628a3282f9c320db18658c21749235fce80")
     version("4.5.0", sha256="5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330")
     version("4.3.0", sha256="e0ecea24247a837c71c106b0341a7a997e3653da820d21ef6c08b32548f733e7")