py-jupyterlab: add v3.4.2 (#30867)

9 files changed, 99 insertions, 33 deletions

diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py
index 719a16ce80..880ed7ce7c 100644
--- a/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py
@@ -12,6 +12,7 @@ class PyJupyterPackaging(PythonPackage):
     homepage = "https://github.com/jupyter/jupyter-packaging"
     pypi     = "jupyter_packaging/jupyter_packaging-0.10.4.tar.gz"
 
+    version('0.12.0', sha256='b27455d60adc93a7baa2e0b8f386be81b932bb4e3c0116046df9ed230cd3faac')
     version('0.11.1', sha256='6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec')
     version('0.10.6', sha256='a8a2c90bf2e0cae83be63ccb0b7035032a1589f268cc08b1d479e37ce50fc940')
     version('0.10.4', sha256='589db027cb85a92612f9bcfaeecaa8a9072ac8a4bddaf827f648664258e587c4')
@@ -23,7 +24,10 @@ class PyJupyterPackaging(PythonPackage):
     depends_on('python@3.6:', type=('build', 'run'))
     depends_on('py-packaging', type=('build', 'run'))
     depends_on('py-tomlkit', when='@0.8:', type=('build', 'run'))
+    depends_on('py-setuptools@60.2:', when='@0.12:', type=('build', 'run'))
     depends_on('py-setuptools@46.4:', when='@0.8:', type=('build', 'run'))
+    # https://github.com/jupyter/jupyter-packaging/issues/130
+    depends_on('py-setuptools@:60', when='@:0.11', type=('build', 'run'))
     depends_on('py-setuptools', type=('build', 'run'))
     depends_on('py-wheel', when='@0.8:', type=('build', 'run'))
     depends_on('py-deprecation', when='@0.8:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py
index 406596e48f..db926da861 100644
--- a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py
@@ -16,11 +16,15 @@ class PyJupyterPackaging11(PythonPackage):
     homepage = "https://github.com/jupyter/jupyter-packaging"
     pypi     = "jupyter_packaging/jupyter_packaging-0.11.1.tar.gz"
 
+    version('0.12.0', sha256='b27455d60adc93a7baa2e0b8f386be81b932bb4e3c0116046df9ed230cd3faac')
     version('0.11.1', sha256='6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec')
 
     depends_on('python@3.7:', type=('build', 'run'))
     depends_on('py-packaging', type=('build', 'run'))
     depends_on('py-tomlkit', type=('build', 'run'))
+    depends_on('py-setuptools@60.2:', when='@0.12:', type=('build', 'run'))
     depends_on('py-setuptools@46.4:', type=('build', 'run'))
+    # https://github.com/jupyter/jupyter-packaging/issues/130
+    depends_on('py-setuptools@:60', when='@:0.11', type=('build', 'run'))
     depends_on('py-wheel', type=('build', 'run'))
     depends_on('py-deprecation', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-server/package.py b/var/spack/repos/builtin/packages/py-jupyter-server/package.py
index 1a0e848836..7e4b631f1c 100644
--- a/var/spack/repos/builtin/packages/py-jupyter-server/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyter-server/package.py
@@ -14,6 +14,7 @@ class PyJupyterServer(PythonPackage):
     homepage = "https://github.com/jupyter-server/jupyter_server"
     pypi     = "jupyter_server/jupyter_server-1.9.0.tar.gz"
 
+    version('1.17.0', sha256='7b3aa524790ab0da64f06dfe0b2af149d0a3f59aad71fdedcf1d8bae6508018c')
     version('1.13.5', sha256='9e3e9717eea3bffab8cfb2ff330011be6c8bbd9cdae5b71cef169fcece2f19d3')
     version('1.11.2', sha256='c1f32e0c1807ab2de37bf70af97a36b4436db0bc8af3124632b1f4441038bf95')
     version('1.11.1', sha256='ab7ab1cc38512f15026cbcbb96300fb46ec8b24aa162263d9edd00e0a749b1e8')
@@ -27,23 +28,29 @@ class PyJupyterServer(PythonPackage):
     # TODO: replace this after concretizer learns how to concretize separate build deps
     depends_on('py-jupyter-packaging11', when='@1.6.2:', type='build')
     # depends_on('py-jupyter-packaging@0.9:0', when='@1.6.2:', type='build')
+    depends_on('py-pre-commit', when='@1.16:', type='build')
     depends_on('py-setuptools', type='build')
-    depends_on('py-jinja2', type=('build', 'run'))
-    depends_on('py-tornado@6.1:', type=('build', 'run'))
-    depends_on('py-pyzmq@17:', type=('build', 'run'))
+    depends_on('py-anyio@3.1.0:3', type=('build', 'run'))
     depends_on('py-argon2-cffi', type=('build', 'run'))
-    depends_on('py-ipython-genutils', type=('build', 'run'))
-    depends_on('py-traitlets@5:', when='@1.13.3:', type=('build', 'run'))
-    depends_on('py-traitlets@4.2.1:', type=('build', 'run'))
-    depends_on('py-jupyter-core@4.6.0:', type=('build', 'run'))
+    depends_on('py-ipython-genutils', when='@:1.15', type=('build', 'run'))
+    depends_on('py-jinja2', type=('build', 'run'))
+    depends_on('py-jupyter-client@6.1.12:', when='@1.16:', type=('build', 'run'))
     depends_on('py-jupyter-client@6.1.1:', type=('build', 'run'))
-    depends_on('py-nbformat', type=('build', 'run'))
+    depends_on('py-jupyter-core@4.7:', when='@1.16:', type=('build', 'run'))
+    depends_on('py-jupyter-core@4.6:', type=('build', 'run'))
+    depends_on('py-nbconvert@6.4.4:', when='@1.16:', type=('build', 'run'))
     depends_on('py-nbconvert', type=('build', 'run'))
-    depends_on('py-send2trash', type=('build', 'run'))
-    depends_on('py-terminado@0.8.3:', type=('build', 'run'))
-    depends_on('py-prometheus-client', type=('build', 'run'))
-    depends_on('py-anyio@3.1.0:3', type=('build', 'run'))
-    depends_on('py-websocket-client', type=('build', 'run'))
+    depends_on('py-nbformat@5.2:', when='@1.15:', type=('build', 'run'))
+    depends_on('py-nbformat', type=('build', 'run'))
     depends_on('py-packaging', when='@1.13.2:', type=('build', 'run'))
+    depends_on('py-prometheus-client', type=('build', 'run'))
     # for windows depends_on pywinpty@:1, when='@1.13.2:'
+    depends_on('py-pyzmq@17:', type=('build', 'run'))
     depends_on('py-requests-unixsocket', when='@:1.11.1', type=('build', 'run'))
+    depends_on('py-send2trash', type=('build', 'run'))
+    depends_on('py-terminado@0.8.3:', type=('build', 'run'))
+    depends_on('py-tornado@6.1:', type=('build', 'run'))
+    depends_on('py-traitlets@5.1:', when='@1.16:', type=('build', 'run'))
+    depends_on('py-traitlets@5:', when='@1.13.3:', type=('build', 'run'))
+    depends_on('py-traitlets@4.2.1:', type=('build', 'run'))
+    depends_on('py-websocket-client', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-jupyterlab/package.py b/var/spack/repos/builtin/packages/py-jupyterlab/package.py
index 517f74f4c8..389f22b22b 100644
--- a/var/spack/repos/builtin/packages/py-jupyterlab/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyterlab/package.py
@@ -17,6 +17,7 @@ class PyJupyterlab(PythonPackage):
     # Skip 'jupyterlab.tests' packages
     import_modules = ['jupyterlab', 'jupyterlab.handlers']
 
+    version('3.4.2', sha256='38abd3a4f83a8f97e3f15bebbcc0825903c15519809eedfaa41340d260be2160')
     version('3.2.9', sha256='65ddc34e5da1a764606e38c4f70cf9d4ac1c05182813cf0ab2dfea312c701124')
     version('3.2.1', sha256='54466941bcd9b52f23373a32038fbb4e50fd652d4536df6179b53e1ffb8ef431')
     version('3.1.19', sha256='8853a6fa16179ae24b6277541b1619593e0e99da10b380cd72f391b549f59705')
@@ -28,6 +29,7 @@ class PyJupyterlab(PythonPackage):
     version('2.2.7', sha256='a72ffd0d919cba03a5ef8422bc92c3332a957ff97b0490494209c83ad93826da')
     version('2.1.0', sha256='8c239aababf5baa0b3d36e375fddeb9fd96f3a9a24a8cda098d6a414f5bbdc81')
 
+    depends_on('python@3.7:', when='@3.3:', type=('build', 'run'))
     depends_on('python@3.6:', when='@3:', type=('build', 'run'))
     depends_on('python@3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type=('build', 'run'))
@@ -37,6 +39,7 @@ class PyJupyterlab(PythonPackage):
     # depends_on('py-jupyter-packaging@0.9:0', when='@3.0.15:', type='build')
     # depends_on('py-jupyter-packaging@0.7.3:0.7', when='@3.0.0:3.0.14',
     #            type=('build', 'run'))
+    depends_on('py-pre-commit', when='@3.4:', type='build')
     # dependency on py-jinja2@2.1 seems to be a migration issue from the switch
     # to setup.cfg in 3.0.15, leave it a 2.10
     depends_on('py-jinja2@2.10:', type=('build', 'run'))
@@ -46,14 +49,16 @@ class PyJupyterlab(PythonPackage):
     depends_on('py-packaging', when='@3:', type=('build', 'run'))
     depends_on('py-tornado@6.1:', when='@3:', type=('build', 'run'))
     depends_on('py-jupyter-core', when='@3:', type=('build', 'run'))
-    depends_on('py-jupyterlab-server@2.3:2', when='@3.0.9:', type=('build', 'run'))
+    depends_on('py-jupyterlab-server@2.10:2', when='@3.3:', type=('build', 'run'))
+    depends_on('py-jupyterlab-server@2.3:2', when='@3.0.9:3.2', type=('build', 'run'))
     depends_on('py-jupyterlab-server@2.0:2', when='@3.0.0:3.0.8', type=('build', 'run'))
-    depends_on('py-jupyter-server@1.4:1', when='@3.0.9:', type=('build', 'run'))
+    depends_on('py-jupyter-server@1.16:1', when='@3.4:', type=('build', 'run'))
+    depends_on('py-jupyter-server@1.4:1', when='@3.0.9:3.3', type=('build', 'run'))
     depends_on('py-jupyter-server@1.2:1', when='@3.0.3:3.0.8', type=('build', 'run'))
     depends_on('py-jupyter-server@1.1:1', when='@3.0.0:3.0.2', type=('build', 'run'))
     depends_on('py-nbclassic@0.2.0:0', when='@3:', type=('build', 'run'))
 
-    # @:3
+    # @:2
     depends_on('py-notebook@4.3.1:', when='@:2', type=('build', 'run'))
     depends_on('py-tornado@:5,6.0.3:', when='@:2', type=('build', 'run'))
     depends_on('py-jupyterlab-server@1.1.5:1', when='@:2', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py
index 14b913e84c..8083a2907c 100644
--- a/var/spack/repos/builtin/packages/py-nbconvert/package.py
+++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py
@@ -13,6 +13,7 @@ class PyNbconvert(PythonPackage):
     homepage = "https://github.com/jupyter/nbconvert"
     pypi = "nbconvert/nbconvert-6.0.1.tar.gz"
 
+    version('6.5.0', sha256='223e46e27abe8596b8aed54301fadbba433b7ffea8196a68fd7b1ff509eee99d')
     version('6.4.2', sha256='eb2803db18f6facce6bf3b01b684fe47907994bd156d15eaccdf011e3d7f8164')
     version('6.3.0', sha256='5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a')
     version('6.2.0', sha256='16ceecd0afaa8fd26c245fa32e2c52066c02f13aa73387fffafd84750baea863')
@@ -30,29 +31,39 @@ class PyNbconvert(PythonPackage):
     depends_on('python@3.6:', type=('build', 'run'), when='@6:')
     depends_on('python@3.7:', type=('build', 'run'), when='@6.2.0:')
     depends_on('py-setuptools', type=('build', 'run'), when='@5:')
-    depends_on('py-pycurl', type='build', when='^python@:2.7.8')
-    depends_on('py-mistune@0.8.1:1', type=('build', 'run'))
+    depends_on('py-setuptools@60:', type=('build', 'run'), when='@6.5:')
+    depends_on('py-beautifulsoup4', type=('build', 'run'), when='@6.4.4:')
+    depends_on('py-bleach', type=('build', 'run'), when='@5:')
+    depends_on('py-defusedxml', type=('build', 'run'), when='@5:')
+    depends_on('py-entrypoints', type=('build', 'run'))
+    depends_on('py-entrypoints@0.2.2:', type=('build', 'run'), when='@5:')
     depends_on('py-jinja2', type=('build', 'run'))
     depends_on('py-jinja2@2.4:', type=('build', 'run'), when='@5:')
+    depends_on('py-jinja2@3:', type=('build', 'run'), when='@6.5:')
+    depends_on('py-jupyter-core', type=('build', 'run'))
+    depends_on('py-jupyter-core@4.7:', type=('build', 'run'), when='@6.5:')
+    depends_on('py-jupyterlab-pygments', type=('build', 'run'), when='@6:')
+    depends_on('py-markupsafe@2:', type=('build', 'run'), when='@6.4.5:')
+    depends_on('py-mistune@0.8.1:1', type=('build', 'run'))
+    depends_on('py-nbclient@0.5', type=('build', 'run'), when='@6:6.4')
+    depends_on('py-nbclient@0.5:', type=('build', 'run'), when='@6.5:')
+    depends_on('py-nbformat', type=('build', 'run'))
+    depends_on('py-nbformat@4.4:', type=('build', 'run'), when='@5:')
+    depends_on('py-nbformat@5.1:', type=('build', 'run'), when='@6.5:')
+    depends_on('py-packaging', type=('build', 'run'), when='@6.5:')
+    depends_on('py-pandocfilters@1.4.1:', type=('build', 'run'), when='@5:')
+    depends_on('py-pycurl', type='build', when='^python@:2.7.8')
     depends_on('py-pygments', type=('build', 'run'))
     depends_on('py-pygments@2.4.1:', type=('build', 'run'), when='@6:')
-    depends_on('py-jupyterlab-pygments', type=('build', 'run'), when='@6:')
+    depends_on('py-testpath', type=('build', 'run'), when='@5:6.4')
+    depends_on('py-tinycss2', type=('build', 'run'), when='@6.5:')
     depends_on('py-traitlets', type=('build', 'run'))
     depends_on('py-traitlets@4.2:', type=('build', 'run'), when='@5:')
     depends_on('py-traitlets@5:', type=('build', 'run'), when='@6.2.0:')
-    depends_on('py-jupyter-core', type=('build', 'run'))
-    depends_on('py-nbformat', type=('build', 'run'))
-    depends_on('py-nbformat@4.4.0:', type=('build', 'run'), when='@5:')
-    depends_on('py-entrypoints', type=('build', 'run'))
-    depends_on('py-entrypoints@0.2.2:', type=('build', 'run'), when='@5:')
-    depends_on('py-bleach', type=('build', 'run'), when='@5:')
-    depends_on('py-pandocfilters@1.4.1:', type=('build', 'run'), when='@5:')
-    depends_on('py-testpath', type=('build', 'run'), when='@5:')
-    depends_on('py-defusedxml', type=('build', 'run'), when='@5:')
-    depends_on('py-nbclient@0.5.0:0.5', type=('build', 'run'), when='@6:')
 
     # https://bugs.gentoo.org/720870
     # https://github.com/jupyter/nbconvert/pull/937
+    depends_on('py-tornado@6.1:', type=('build', 'run'), when='@6.5: +serve')
     depends_on('py-tornado@4.0:', type=('build', 'run'), when='@5.4.1: +serve')
     depends_on('py-tornado@4.0:5', type=('build', 'run'), when='@:5.4.0 +serve')
 
diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py
index 4b4e704773..03a2db7b4a 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.4.0', sha256='44ba5ca6acb80c5d5a500f1e5b83ede8cbe364d5a495c4c8cf60aaf1ba656501')
     version('5.1.3', sha256='b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8')
     version('5.0.7', sha256='54d4d6354835a936bad7e8182dcd003ca3dc0cedfee5a306090e04854343b340')
     version('4.4.0', sha256='f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402')
@@ -20,11 +21,15 @@ 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'))
-    # pip silently replaces distutils with setuptools
+    depends_on('py-setuptools@60:', when='@5.3:', type='build')
     depends_on('py-setuptools', type='build')
-    depends_on('py-ipython-genutils', type=('build', 'run'))
+    depends_on('py-ipython-genutils', when='@:5.1', 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-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-jupyter-core', type=('build', 'run'))
+    depends_on('py-fastjsonschema', when='@5.3:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py
index 85321262a3..1e4b954968 100644
--- a/var/spack/repos/builtin/packages/py-notebook/package.py
+++ b/var/spack/repos/builtin/packages/py-notebook/package.py
@@ -13,6 +13,7 @@ class PyNotebook(PythonPackage):
     homepage = "https://github.com/jupyter/notebook"
     pypi = "notebook/notebook-6.1.4.tar.gz"
 
+    version('6.4.11', sha256='709b1856a564fe53054796c80e17a67262071c86bfbdfa6b96aaa346113c555a')
     version('6.4.5', sha256='872e20da9ae518bbcac3e4e0092d5bd35454e847dedb8cb9739e9f3b68406be0')
     version('6.1.4', sha256='687d01f963ea20360c0b904ee7a37c3d8cda553858c8d6e33fd0afd13e89de32')
     version('6.0.3', sha256='47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48')
@@ -38,6 +39,10 @@ class PyNotebook(PythonPackage):
     depends_on('python@2.7:2.8,3.3:', type=('build', 'run'))
     depends_on('python@3.5:',         type=('build', 'run'), when='@6:')
     depends_on('python@3.6:',         type=('build', 'run'), when='@6.3:')
+    depends_on('python@3.7:',         type=('build', 'run'), when='@6.4:')
+    # TODO: replace this after concretizer learns how to concretize separate build deps
+    depends_on('py-jupyter-packaging11', when='@6.4.1:', type='build')
+    # depends_on('py-jupyter-packaging@0.9:0', when='@6.4.1:', type='build')
     depends_on('py-setuptools',       type=('build', 'run'), when='@5:')
     depends_on('py-jinja2',           type=('build', 'run'))
     depends_on('py-tornado@4.0:6', type=('build', 'run'), when='@:5.7.4')
@@ -46,7 +51,6 @@ class PyNotebook(PythonPackage):
     depends_on('py-tornado@6.1:',      type=('build', 'run'), when='@6.4.5:')
     depends_on('py-pyzmq@17:',         type=('build', 'run'), when='@6:')
     depends_on('py-argon2-cffi',       type=('build', 'run'), when='@6.1:')
-    depends_on('py-ipython-genutils', type=('build', 'run'))
     depends_on('py-traitlets',        type=('build', 'run'))
     depends_on('py-traitlets@4.2.1:', type=('build', 'run'), when='@5:')
     depends_on('py-jupyter-core',        type=('build', 'run'))
@@ -57,13 +61,16 @@ class PyNotebook(PythonPackage):
     depends_on('py-jupyter-client@5.2.0:', type=('build', 'run'), when='@5.7.0:5')
     depends_on('py-jupyter-client@5.3.1:', type=('build', 'run'), when='@6.0.0:6.0.1')
     depends_on('py-jupyter-client@5.3.4:', type=('build', 'run'), when='@6.0.2:')
+    depends_on('py-ipython-genutils', type=('build', 'run'))
     depends_on('py-nbformat',         type=('build', 'run'))
     # https://github.com/jupyter/notebook/pull/6286
     depends_on('py-nbconvert@5:', type=('build', 'run'), when='@5.5:')
     depends_on('py-nbconvert',        type=('build', 'run'))
+    depends_on('py-nest-asyncio@1.5:', type=('build', 'run'), when='@6.4.10:')
     depends_on('py-ipykernel',        type=('build', 'run'))
     depends_on('py-send2trash',        type=('build', 'run'), when='@6:')
-    depends_on('py-send2trash@1.5.0:', type=('build', 'run'), when='@6.2.0:')
+    depends_on('py-send2trash@1.5:', type=('build', 'run'), when='@6.2.0:')
+    depends_on('py-send2trash@1.8:', type=('build', 'run'), when='@6.4.10:')
     depends_on('py-terminado@0.3.3:', type=('build', 'run'), when='@:5.7.0')
     depends_on('py-terminado@0.8.1:', type=('build', 'run'), when='@5.7.0:')
     depends_on('py-terminado@0.8.3:', type=('build', 'run'), when='@6.1:')
diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py
index 194ac780fa..43c2045c31 100644
--- a/var/spack/repos/builtin/packages/py-setuptools/package.py
+++ b/var/spack/repos/builtin/packages/py-setuptools/package.py
@@ -13,6 +13,7 @@ class PySetuptools(PythonPackage):
     homepage = "https://github.com/pypa/setuptools"
     pypi = "setuptools/setuptools-57.4.0.tar.gz"
 
+    version('62.3.2', sha256='a43bdedf853c670e5fed28e5623403bad2f73cf02f9a2774e91def6bda8265a7')
     version('59.4.0', sha256='b4c634615a0cf5b02cf83c7bedffc8da0ca439f00e79452699454da6fbd4153d')
     version('58.2.0', sha256='2c55bdb85d5bb460bd2e3b12052b677879cffcf46c0c688f2e5bf51d36001145')
     version('57.4.0', sha256='6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465')
@@ -43,6 +44,7 @@ class PySetuptools(PythonPackage):
     version('16.0',   sha256='aa86255dee2c4a0056509750008007667c29306b7a6c13801468515b2c672845')
     version('11.3.1', sha256='bd25f17de4ecf00116a9f7368b614a54ca1612d7945d2eafe5d97bc08c138bc5')
 
+    depends_on('python@3.7:', type=('build', 'run'), when='@59.7:')
     depends_on('python@3.6:', type=('build', 'run'), when='@51:')
     depends_on('python@3.5:', type=('build', 'run'), when='@45:50')
     depends_on('python@2.7:2.8,3.5:', type=('build', 'run'), when='@44')
diff --git a/var/spack/repos/builtin/packages/py-tinycss2/package.py b/var/spack/repos/builtin/packages/py-tinycss2/package.py
new file mode 100644
index 0000000000..2fb01db33e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-tinycss2/package.py
@@ -0,0 +1,21 @@
+# Copyright 2013-2022 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 import *
+
+
+class PyTinycss2(PythonPackage):
+    """tinycss2 is a low-level CSS parser and generator written in Python: it can parse
+    strings, return objects representing tokens and blocks, and generate CSS strings
+    corresponding to these objects."""
+
+    homepage = "https://www.courtbouillon.org/tinycss2"
+    pypi     = "tinycss2/tinycss2-1.1.1.tar.gz"
+
+    version('1.1.1', sha256='b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf')
+
+    depends_on('python@3.6:', type=('build', 'run'))
+    depends_on('py-flit-core@3.2:3', type='build')
+    depends_on('py-webencodings@0.4:', type=('build', 'run'))