py-black: add v22.1.0 (#28680)

2 files changed, 26 insertions, 21 deletions

diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py
index a11b5533e2..406b58087e 100644
--- a/var/spack/repos/builtin/packages/py-black/package.py
+++ b/var/spack/repos/builtin/packages/py-black/package.py
@@ -13,49 +13,52 @@ class PyBlack(PythonPackage):
     """
 
     homepage = "https://github.com/psf/black"
-    pypi = "black/black-20.8b1.tar.gz"
+    pypi = "black/black-22.1.0.tar.gz"
 
-    version('21.7b0', sha256='c8373c6491de9362e39271630b65b964607bc5c79c83783547d76c839b3aa219')
-    version('21.6b0', sha256='dc132348a88d103016726fe360cb9ede02cecf99b76e3660ce6c596be132ce04')
-    version('21.4b0', sha256='915d916c48646dbe8040d5265cff7111421a60a3dfe7f7e07273176a57c24a34')
-    version('20.8b1', sha256='1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea')
-    version('19.3b0', sha256='68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c')
-    version('18.9b0', sha256='e030a9a28f542debc08acceb273f228ac422798e5215ba2a791a6ddeaaca22a5')
+    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')
-    variant('python2', default=False, description='enable python 2 formatting support')
 
     depends_on('python@3.6.0:', type=('build', 'run'))
     depends_on('python@3.6.2:', when='@21:', type=('build', 'run'))
-    # Needs setuptools at runtime so that `import pkg_resources` succeeds
-    # See #8843 and #8689 for examples of setuptools added as a runtime dep
     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')
-    # Translated from black's setup.py:
-    # https://github.com/ambv/black/blob/master/setup.py
+    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-appdirs', 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:', 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:', type=('build', 'run'))
-    depends_on('py-pathspec@0.6:0', when='@19.10b0:', type=('build', 'run'))
-    depends_on('py-pathspec@0.8.1:0', when='@21.6:', 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.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'))
     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-cors', when='+d', type=('build', 'run'))
-    depends_on('py-aiohttp-cors@0.4.0:', when='@21.6: +d', type=('build', 'run'))
-    depends_on('py-typed-ast@1.4.2:', when='+python2', 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'))
 
     @property
     def import_modules(self):
diff --git a/var/spack/repos/builtin/packages/py-pathspec/package.py b/var/spack/repos/builtin/packages/py-pathspec/package.py
index e64ada8e17..1dc7a4cf85 100644
--- a/var/spack/repos/builtin/packages/py-pathspec/package.py
+++ b/var/spack/repos/builtin/packages/py-pathspec/package.py
@@ -12,8 +12,10 @@ class PyPathspec(PythonPackage):
 
     pypi = "pathspec/pathspec-0.8.1.tar.gz"
 
+    version('0.9.0', sha256='e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1')
     version('0.8.1', sha256='86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd')
     version('0.3.4', sha256='7605ca5c26f554766afe1d177164a2275a85bb803b76eba3428f422972f66728')
 
     depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
+    depends_on('py-setuptools@39.2:', when='@0.9:', type='build')