py-black: new version/variants/maintainer (#30999)

2 files changed, 29 insertions, 41 deletions

diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py
index accfb182df..d403da9c6f 100644
--- a/var/spack/repos/builtin/packages/py-black/package.py
+++ b/var/spack/repos/builtin/packages/py-black/package.py
@@ -15,50 +15,36 @@ class PyBlack(PythonPackage):
     homepage = "https://github.com/psf/black"
     pypi = "black/black-22.1.0.tar.gz"
 
+    maintainers = ['adamjstewart']
+
+    version('22.3.0', sha256='35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79')
     version('22.1.0', sha256='a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5')
-    version('21.7b0', sha256='c8373c6491de9362e39271630b65b964607bc5c79c83783547d76c839b3aa219', deprecated=True)
-    version('21.6b0', sha256='dc132348a88d103016726fe360cb9ede02cecf99b76e3660ce6c596be132ce04', deprecated=True)
-    version('21.4b0', sha256='915d916c48646dbe8040d5265cff7111421a60a3dfe7f7e07273176a57c24a34', deprecated=True)
-    version('20.8b1', sha256='1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea', deprecated=True)
-    version('19.3b0', sha256='68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c', deprecated=True)
-    version('18.9b0', sha256='e030a9a28f542debc08acceb273f228ac422798e5215ba2a791a6ddeaaca22a5', deprecated=True)
 
-    variant('colorama', default=False, description='enable colorama support')
     variant('d', default=False, description='enable blackd HTTP server')
-
-    depends_on('python@3.6.0:', type=('build', 'run'))
-    depends_on('python@3.6.2:', when='@21:', type=('build', 'run'))
-    depends_on('py-setuptools', type=('build', 'run'))
-    depends_on('py-setuptools@45:', when='@22:', type=('build', 'run'))
-    depends_on('py-setuptools-scm', when='@19.10:', type='build')
-    depends_on('py-setuptools-scm@6.3.1:+toml', when='@22:', type='build')
-    depends_on('py-click@6.5:', type=('build', 'run'))
-    depends_on('py-click@7.1.2:', when='@20.8b1:', type=('build', 'run'))
-    depends_on('py-click@8:', when='@22:', type=('build', 'run'))
-    depends_on('py-attrs@18.1.0:', when='@:20.8b0', type=('build', 'run'))
-    depends_on('py-platformdirs@2:', when='@22:', type=('build', 'run'))
-    depends_on('py-appdirs', when='@:21', type=('build', 'run'))
-    depends_on('py-toml@0.9.4:', when='@:19', type=('build', 'run'))
-    depends_on('py-toml@0.10.1:', when='@20:21.6', type=('build', 'run'))
-    depends_on('py-tomli@0.2.6:1', when='@21.7:21', type=('build', 'run'))
-    depends_on('py-tomli@1.1:', when='@22:', type=('build', 'run'))
-    depends_on('py-typed-ast@1.4.0:', when='@19.10b0:20', type=('build', 'run'))
-    depends_on('py-typed-ast@1.4.2:', when='@21: ^python@:3.7', type=('build', 'run'))
-    depends_on('py-regex@2020.1.8:', when='@20.8b0:21', type=('build', 'run'))
-    depends_on('py-pathspec@0.6:0', when='@19.10b0:21.5', type=('build', 'run'))
-    depends_on('py-pathspec@0.8.1:0', when='@21.6:21', type=('build', 'run'))
-    depends_on('py-pathspec@0.9:', when='@22:', type=('build', 'run'))
-    depends_on('py-dataclasses@0.6:', when='@20.8b0:^python@:3.6', type=('build', 'run'))
-    depends_on('py-typing-extensions@3.7.4:', when='@20.8b0:20', type=('build', 'run'))
-    depends_on('py-typing-extensions@3.7.4:', when='@21 ^python@:3.7', type=('build', 'run'))
-    depends_on('py-typing-extensions@3.10:', when='@22: ^python@:3.9', type=('build', 'run'))
-    depends_on('py-mypy-extensions@0.4.3:', when='@20.8b0:', type=('build', 'run'))
+    variant('colorama', default=False, description='enable colorama support')
+    variant('uvloop', default=False, description='enable uvloop support')
+    variant('jupyter', default=False, description='enable Jupyter support')
+
+    # pyproject.toml
+    depends_on('py-setuptools@45:', type=('build', 'run'))
+    depends_on('py-setuptools-scm@6.3.1:+toml', type='build')
+
+    # setup.py
+    depends_on('python@3.6.2:', type=('build', 'run'))
+    depends_on('py-click@8:', type=('build', 'run'))
+    depends_on('py-platformdirs@2:', type=('build', 'run'))
+    depends_on('py-tomli@1.1:', when='@22.3: ^python@:3.10', type=('build', 'run'))
+    depends_on('py-tomli@1.1:', when='@22.1', type=('build', 'run'))
+    depends_on('py-typed-ast@1.4.2:', when='^python@:3.7', type=('build', 'run'))
+    depends_on('py-pathspec@0.9:', type=('build', 'run'))
+    depends_on('py-dataclasses@0.6:', when='^python@:3.6', type=('build', 'run'))
+    depends_on('py-typing-extensions@3.10:', when='^python@:3.9', type=('build', 'run'))
+    depends_on('py-mypy-extensions@0.4.3:', type=('build', 'run'))
     depends_on('py-colorama@0.4.3:', when='+colorama', type=('build', 'run'))
-    depends_on('py-aiohttp@3.3.2:', when='+d', type=('build', 'run'))
-    depends_on('py-aiohttp@3.6.0:', when='@21.6: +d', type=('build', 'run'))
-    depends_on('py-aiohttp@3.7.4:', when='@22: +d', type=('build', 'run'))
-    depends_on('py-aiohttp-cors', when='@:21 +d', type=('build', 'run'))
-    depends_on('py-aiohttp-cors@0.4.0:', when='@21.6:21 +d', type=('build', 'run'))
+    depends_on('py-aiohttp@3.7.4:', when='+d', type=('build', 'run'))
+    depends_on('py-uvloop@0.15.2:', when='+uvloop', type=('build', 'run'))
+    depends_on('py-ipython@7.8:', when='+jupyter', type=('build', 'run'))
+    depends_on('py-tokenize-rt@3.2:', when='+jupyter', type=('build', 'run'))
 
     @property
     def import_modules(self):
diff --git a/var/spack/repos/builtin/packages/py-uvloop/package.py b/var/spack/repos/builtin/packages/py-uvloop/package.py
index 12694a4e18..314a694ef3 100644
--- a/var/spack/repos/builtin/packages/py-uvloop/package.py
+++ b/var/spack/repos/builtin/packages/py-uvloop/package.py
@@ -12,7 +12,9 @@ class PyUvloop(PythonPackage):
     homepage = "https://github.com/MagicStack/uvloop"
     pypi = "uvloop/uvloop-0.14.0.tar.gz"
 
+    version('0.16.0', sha256='f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228')
     version('0.14.0', sha256='123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e')
 
+    depends_on('python@3.7:', when='@0.15:', type=('build', 'run'))
+    depends_on('python@3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
-    depends_on('py-wheel', type='build')