py-flake8: add v5.0 (#31854)

4 files changed, 62 insertions, 45 deletions

diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py
index 80fdd0095e..f42d4e1ed2 100644
--- a/var/spack/repos/builtin/packages/py-flake8/package.py
+++ b/var/spack/repos/builtin/packages/py-flake8/package.py
@@ -13,6 +13,9 @@ class PyFlake8(PythonPackage):
     homepage = "https://github.com/PyCQA/flake8"
     pypi = "flake8/flake8-4.0.1.tar.gz"
 
+    version("5.0.2", sha256="9cc32bc0c5d16eacc014c7ec6f0e9565fd81df66c2092c3c9df06e3c1ac95e5d")
+    version("5.0.1", sha256="9c51d3d1426379fd444d3b79eabbeb887849368bd053039066439523d8486961")
+    version("5.0.0", sha256="503b06b6795189e55298a70b695b1eb4f6b8d479fae81352fc97c72ca242509e")
     version("4.0.1", sha256="806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d")
     version("4.0.0", sha256="b52d27e627676b015340c3b1c72bc9259a6cacc9341712fb8f01ddfaaa2c651a")
     version("3.9.2", sha256="07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b")
@@ -24,9 +27,10 @@ class PyFlake8(PythonPackage):
     version("2.5.4", sha256="cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f")
 
     extends("python", ignore="bin/(pyflakes|pycodestyle)")
+    depends_on("python@3.6.1:", when="@5:", type=("build", "run"))
+    depends_on("python@3.6:", when="@4:", type=("build", "run"))
+    depends_on("python@2.7:2.8,3.5:", when="@3.9.2:", type=("build", "run"))
     depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@3.9.2:")
-    depends_on("python@3.6:", type=("build", "run"), when="@4.0.0:")
 
     # Most Python packages only require py-setuptools as a build dependency.
     # However, py-flake8 requires py-setuptools during runtime as well.
@@ -37,48 +41,56 @@ class PyFlake8(PythonPackage):
     # http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
     # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
 
+    # Flake8 5.0.X
+    depends_on("py-mccabe@0.7", when="@5.0", type=("build", "run"))
+    depends_on("py-pycodestyle@2.9", when="@5.0", type=("build", "run"))
+    depends_on("py-pyflakes@2.5", when="@5.0", type=("build", "run"))
+
     # Flake8 4.0.X
-    depends_on("py-pycodestyle@2.8.0:2.8", when="@4.0.0:4.0", type=("build", "run"))
-    depends_on("py-pyflakes@2.4.0:2.4", when="@4.0.0:4.0", type=("build", "run"))
+    depends_on("py-mccabe@0.6", when="@4.0", type=("build", "run"))
+    depends_on("py-pycodestyle@2.8", when="@4.0", type=("build", "run"))
+    depends_on("py-pyflakes@2.4", when="@4.0", type=("build", "run"))
 
     # Flake8 3.9.X
-    depends_on("py-pycodestyle@2.7.0:2.7", when="@3.9.0:3.9", type=("build", "run"))
-    depends_on("py-pyflakes@2.3.0:2.3", when="@3.9.0:3.9", type=("build", "run"))
+    depends_on("py-pyflakes@2.3", when="@3.9", type=("build", "run"))
+    depends_on("py-pycodestyle@2.7", when="@3.9", type=("build", "run"))
+    depends_on("py-mccabe@0.6", when="@3.9", type=("build", "run"))
 
     # Flake8 3.8.X
-    depends_on("py-pycodestyle@2.6.0:2.6", when="@3.8.0:3.8", type=("build", "run"))
-    depends_on("py-pyflakes@2.2.0:2.2", when="@3.8.0:3.8", type=("build", "run"))
+    depends_on("py-pyflakes@2.2", when="@3.8", type=("build", "run"))
+    depends_on("py-pycodestyle@2.6", when="@3.8", type=("build", "run"))
+    depends_on("py-mccabe@0.6", when="@3.8", type=("build", "run"))
 
     # Flake8 3.7.X
-    # FIXME @0.3.0:0.3 causes concretization to hang
-    depends_on("py-entrypoints@0.3", when="@3.7.0:3.8", type=("build", "run"))
-    depends_on("py-pyflakes@2.1.0:2.1", when="@3.7.0:3.7", type=("build", "run"))
-    depends_on("py-pycodestyle@2.5.0:2.5", when="@3.7.0:3.7", type=("build", "run"))
-    depends_on("py-mccabe@0.6.0:0.6", when="@3.7.0:", type=("build", "run"))
+    depends_on("py-entrypoints@0.3", when="@3.7", type=("build", "run"))
+    depends_on("py-pyflakes@2.1", when="@3.7", type=("build", "run"))
+    depends_on("py-pycodestyle@2.5", when="@3.7", type=("build", "run"))
+    depends_on("py-mccabe@0.6", when="@3.7", type=("build", "run"))
 
     # Flake8 3.5.X
-    depends_on("py-pyflakes@1.5:1.6", when="@3.5.0:3.5", type=("build", "run"))
-    depends_on("py-pycodestyle@2.0:2.4", when="@3.5.0:3.5", type=("build", "run"))
-    depends_on("py-mccabe@0.6.0:0.6", when="@3.5.0:3.5", type=("build", "run"))
+    depends_on("py-pyflakes@1.5:1.6", when="@3.5", type=("build", "run"))
+    depends_on("py-pycodestyle@2.0:2.4", when="@3.5", type=("build", "run"))
+    depends_on("py-mccabe@0.6", when="@3.5", type=("build", "run"))
 
     # Flake8 3.0.X
-    depends_on("py-pyflakes@0.8.1:1.1,1.2.3:1.2", when="@3.0.0:3.0", type=("build", "run"))
-    depends_on("py-pycodestyle@2.0.0:2.0", when="@3.0.0:3.0", type=("build", "run"))
-    depends_on("py-mccabe@0.5.0:0.5", when="@3.0.0:3.0", type=("build", "run"))
+    depends_on("py-pyflakes@0.8.1:1.1,1.2.3:1.2", when="@3.0", type=("build", "run"))
+    depends_on("py-pycodestyle@2.0", when="@3.0", type=("build", "run"))
+    depends_on("py-mccabe@0.5", when="@3.0", type=("build", "run"))
 
     # Flake8 2.5.X
-    depends_on("py-pyflakes@0.8.1:1.0", when="@2.5.0:2.5", type=("build", "run"))
-    depends_on("py-pycodestyle@1.5.7:1.5,1.6.3:", when="@2.5.0:2.5", type=("build", "run"))
-    depends_on("py-mccabe@0.2.1:0.4", when="@2.5.0:2.5", type=("build", "run"))
+    depends_on("py-pyflakes@0.8.1:1.0", when="@2.5", type=("build", "run"))
+    depends_on("py-pycodestyle@1.5.7:1.5,1.6.3:", when="@2.5", type=("build", "run"))
+    depends_on("py-mccabe@0.2.1:0.4", when="@2.5", type=("build", "run"))
 
     # Python version-specific backports
-    depends_on("py-importlib-metadata", when="@3.8.0:3.9.2 ^python@:3.7", type=("build", "run"))
-    depends_on("py-importlib-metadata@:4.2", when="@4.0.0: ^python@:3.7", type=("build", "run"))
-    depends_on("py-enum34", when="@3.0.0: ^python@:3.3", type=("build", "run"))
-    depends_on("py-typing", when="@3.7.0: ^python@:3.4", type=("build", "run"))
-    depends_on("py-configparser", when="@3.0.0: ^python@:3.1", type=("build", "run"))
+    depends_on("py-importlib-metadata", when="@3.8:3.9.2 ^python@:3.7", type=("build", "run"))
+    depends_on("py-importlib-metadata@:4.2", when="@4: ^python@:3.7", type=("build", "run"))
+    depends_on("py-enum34", when="@3: ^python@:3.3", type=("build", "run"))
+    depends_on("py-typing", when="@3.7: ^python@:3.4", type=("build", "run"))
+    depends_on("py-configparser", when="@3: ^python@:3.1", type=("build", "run"))
     depends_on("py-functools32", when="@3.7.4: ^python@:3.1", type=("build", "run"))
 
+    @when("@:3.5")
     def patch(self):
         """Filter pytest-runner requirement out of setup.py."""
         filter_file("['pytest-runner']", "[]", "setup.py", string=True)
diff --git a/var/spack/repos/builtin/packages/py-mccabe/package.py b/var/spack/repos/builtin/packages/py-mccabe/package.py
index c85179c2ad..6588f92534 100644
--- a/var/spack/repos/builtin/packages/py-mccabe/package.py
+++ b/var/spack/repos/builtin/packages/py-mccabe/package.py
@@ -10,25 +10,26 @@ class PyMccabe(PythonPackage):
     """Ned's script to check McCabe complexity."""
 
     homepage = "https://github.com/PyCQA/mccabe"
-    url = "https://github.com/PyCQA/mccabe/archive/0.5.2.tar.gz"
-
-    version("0.6.1", sha256="2748af6516175b94be318cd8226fa50b5339b9dc886bce378ac2afb37a157524")
-    version("0.6.0", sha256="f42593f451106965053fa852dfd395b85a2fcb6df960e268cb7a1d60d4aec291")
-    version("0.5.3", sha256="4a1582dfe070e630387710169e4731a1b0a4eab736431fa25e91f1fcaf3cbe94")
-    version("0.5.2", sha256="a456c9e2529bf4e7e9e690b20557c5ae5d9cbe25df2a0bbc73dcc39b1b959f4b")
-    version("0.5.1", sha256="31377e7d65ac6458b1f788bf50c34f788f173334383cbfeadd701f772a0f3fe1")
-    version("0.5.0", sha256="b10a4de7987f0e4d6be2a073d1bc91ceed5f0a3715c6088520253e2452ea5dfe")
-    version("0.4.0", sha256="1c0b443fb11dbf90e7caff4366299c0fd69d6bb0c6fedb46fa74283628d8d3ff")
-    version("0.3.1", sha256="244134b78607b74d885ba45f29e495e55c75a261b02de62976233d47e64949ea")
-    version("0.3", sha256="8ef89519a7ce6036597a6bd4d0f28a921cb949cba1bbe42570e5255c6f31456b")
-    version("0.2.1", sha256="88506c11597a4258719b1c7e72317b2145cb43da63314b05d11cd5433dd5a813")
-    version("0.2", sha256="3cc0ff234082035ef4f73640d96ca3f52d6e2e9865a38181093e836370b5f7c3")
-    version("0.1", sha256="10023fc9a64ea25b6cde1f6d0b824990a9882c9086a54b2bcfb8aa70d5ca179f")
-
-    depends_on("python@2.7:2.8,3.3:")
+    pypi = "mccabe/mccabe-0.7.0.tar.gz"
+
+    version("0.7.0", sha256="348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325")
+    version("0.6.1", sha256="dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f")
+    version("0.6.0", sha256="de9bbfe5b771e4c11b1521f3e338fe265a12296b59302f43a3bbf3e02d4b98b1")
+    version("0.5.3", sha256="16293af41e7242031afd73896fef6458f4cad38201d21e28f344fff50ae1c25e")
+    version("0.5.2", sha256="3473f06c8b757bbb5cdf295099bf64032e5f7d6fe0ec2f97ee9b23cb0a435aff")
+    version("0.5.1", sha256="8a30b9cb533b2bde819e7143bd56efc8b52e2fb9ed5ab0983cfd52ca596f88b2")
+    version("0.5.0", sha256="379358498f58f69157b53f59f46aefda0e9a3eb81365238f69fbedf7014e21ab")
+    version("0.4.0", sha256="9a2b12ebd876e77c72e41ebf401cc2e7c5b566649d50105ca49822688642207b")
+    version("0.3.1", sha256="5f7ea6fb3aa9afe146d07fd6d5cedf788747d8b0c29e44732453c2b2db1e3d16")
+    version("0.3", sha256="3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c")
+    version("0.2.1", sha256="5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a")
+    version("0.2", sha256="e0210235022d05d11b3c4c86e2cb65d5b307ab46ac88882d20ff998fd2ef0ad4")
+
+    depends_on("python@3.6:", when="@0.7:", type=("build", "run"))
 
     depends_on("py-setuptools", type="build")
 
+    @when("@:0.6")
     def patch(self):
         """Filter pytest-runner requirement out of setup.py."""
         filter_file("['pytest-runner']", "[]", "setup.py", string=True)
diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py
index ce92a54ee9..866e847d81 100644
--- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py
+++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py
@@ -13,6 +13,7 @@ class PyPycodestyle(PythonPackage):
     homepage = "https://github.com/PyCQA/pycodestyle"
     pypi = "pycodestyle/pycodestyle-2.8.0.tar.gz"
 
+    version("2.9.0", sha256="beaba44501f89d785be791c9462553f06958a221d166c64e1f107320f839acc2")
     version("2.8.0", sha256="eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f")
     version("2.7.0", sha256="c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef")
     version("2.6.0", sha256="c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e")
@@ -76,5 +77,6 @@ class PyPycodestyle(PythonPackage):
     # However, py-pycodestyle requires py-setuptools during runtime as well.
     depends_on("py-setuptools", type=("build", "run"))
 
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"), when="@2.7.0:")
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@2.8.0:")
+    depends_on("python@3.6:", when="@2.9:", type=("build", "run"))
+    depends_on("python@2.7:2.8,3.5:", when="@2.8", type=("build", "run"))
+    depends_on("python@2.7:2.8,3.4:", when="@2.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py
index 4d828b1bc3..3308d56921 100644
--- a/var/spack/repos/builtin/packages/py-pyflakes/package.py
+++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py
@@ -12,6 +12,7 @@ class PyPyflakes(PythonPackage):
     homepage = "https://github.com/PyCQA/pyflakes"
     pypi = "pyflakes/pyflakes-2.4.0.tar.gz"
 
+    version("2.5.0", sha256="491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3")
     version("2.4.0", sha256="05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c")
     version("2.3.0", sha256="e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f")
     version("2.2.0", sha256="35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8")
@@ -30,6 +31,7 @@ class PyPyflakes(PythonPackage):
     version("0.9.1", sha256="baad29ac1e884c7077eb32ed1d9ee5cf30bf4b888329e1fcb51b9aa5298cb3b9")
     version("0.9.0", sha256="4c4d73085ce5de9d8147011c060d129659baa1111d1a5a3035f2bd03f2976538")
 
+    depends_on("python@3.6:", when="@2.5:", type=("build", "run"))
     depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
     # Most Python packages only require py-setuptools as a build dependency.
     # However, py-pyflakes requires py-setuptools during runtime as well.