New versions of py-flake8 and py-pyflakes (#27008)

* New versions of py-flake8 and py-pyflakes

* Changes from review

2 files changed, 41 insertions, 26 deletions

diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py
index 6117be8478..7c682fece8 100644
--- a/var/spack/repos/builtin/packages/py-flake8/package.py
+++ b/var/spack/repos/builtin/packages/py-flake8/package.py
@@ -11,17 +11,22 @@ class PyFlake8(PythonPackage):
     McCabe script."""
 
     homepage = "https://github.com/PyCQA/flake8"
-    url      = "https://github.com/PyCQA/flake8/archive/3.7.8.tar.gz"
+    pypi     = "flake8/flake8-4.0.1.tar.gz"
 
-    version('3.8.2', sha256='ae9b00ddaa2bb7fa69796ac73ba7607fcf06d79a8b777fa12ba5abef1e770491')
-    version('3.7.8',  sha256='201720797dc9691dd349819994e4a0bc281b70ee2ff77b0c928bb1d3c5aa9810')
-    version('3.7.7',  sha256='b3f76b02351008dc772276e74b09dd3d4b5c567ff8c6ab573352cb8fd7007444')
-    version('3.5.0', sha256='60ffe2fdacce4ebe7cadc30f310cf1edfd8ff654ef79525d90cf0756e69de44e')
-    version('3.0.4', sha256='87a2b642900a569fc2f27ab3b79573e0d02d2fee7445c6abab84eb33dcb60365')
-    version('2.5.4', sha256='ce03cc1acbe1726775ca57b40fab1d177550debb2f2f6b7a3c860541f3971cf5')
+    version('4.0.1', sha256='806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d')
+    version('4.0.0', sha256='b52d27e627676b015340c3b1c72bc9259a6cacc9341712fb8f01ddfaaa2c651a')
+    version('3.9.2', sha256='07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b')
+    version('3.8.2', sha256='c69ac1668e434d37a2d2880b3ca9aafd54b3a10a3ac1ab101d22f29e29cf8634')
+    version('3.7.8', sha256='19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548')
+    version('3.7.7', sha256='859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661')
+    version('3.5.0', sha256='7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0')
+    version('3.0.4', sha256='b4c210c998f07d6ff24325dd91fbc011f2c37bcd6bf576b188de01d8656e970d')
+    version('2.5.4', sha256='cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f')
 
     extends('python', ignore='bin/(pyflakes|pycodestyle)')
     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.
@@ -32,6 +37,14 @@ 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 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'))
+
+    # 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'))
+
     # 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'))
@@ -41,7 +54,7 @@ class PyFlake8(PythonPackage):
     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:3.8', type=('build', 'run'))
+    depends_on('py-mccabe@0.6.0:0.6',      when='@3.7.0:', type=('build', 'run'))
 
     # Flake8 3.5.X
     depends_on('py-pyflakes@1.5:1.6',     when='@3.5.0:3.5', type=('build', 'run'))
@@ -59,7 +72,8 @@ class PyFlake8(PythonPackage):
     depends_on('py-mccabe@0.2.1:0.4',                 when='@2.5.0:2.5', type=('build', 'run'))
 
     # Python version-specific backports
-    depends_on('py-importlib-metadata', when='@3.8.0: ^python@:3.7', type=('build', 'run'))
+    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'))
diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py
index 5cbd268fdf..b5d46f5b23 100644
--- a/var/spack/repos/builtin/packages/py-pyflakes/package.py
+++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py
@@ -10,24 +10,25 @@ class PyPyflakes(PythonPackage):
     """A simple program which checks Python source files for errors."""
 
     homepage = "https://github.com/PyCQA/pyflakes"
-    url      = "https://github.com/PyCQA/pyflakes/archive/2.1.1.tar.gz"
+    pypi     = "pyflakes/pyflakes-2.4.0.tar.gz"
 
-    version('2.2.0', sha256='4a6927b9ca7fc19817176d54b3ee2ee4202f064febdee8624ee8340303cfda7b')
-    version('2.1.1', sha256='2c98f07a9dd57d9f33561f6b54a64a766cdf79a3c869bd8c07b7fe03094fb8c3')
-    version('2.1.0', sha256='6cd8775b6430daad386c0de00dfbc27ce2c24468cdcc4d3da41e4aa39d8ce167')
-    version('1.6.0', sha256='f9c72359e05bf8dc27eaaee8cdcae464497f2ccadae87ac6517605ba6040ec99')
-    version('1.5.0', sha256='943ba426420a66b5adebdbe8007e676bba11bf4006e7964d9d9ae98478c57792')
-    version('1.4.0', sha256='7b0c1fe9be9c2b8ebc13bcc7e73f6d1862426c880d467126822a3ad1f8f3be79')
-    version('1.3.0', sha256='7370356f3e20b537e61dfbcaf1ce7bf60aa7147e9e3e639e6401b445acfa3228')
-    version('1.2.3', sha256='4c1c30a63e5ede3cb61ebbe238d4414a039b767b99f85f0574099e314e7102a2')
-    version('1.2.2', sha256='c014aa6a936ccb29eaa89ef1ed4770eec650ea6e3f2c736b667428939fda5532')
-    version('1.2.1', sha256='7de610c7a1dfba2cd34910732db399050ed969b459acc773797f6ff1f742725f')
-    version('1.2.0', sha256='8860de31de5ea68586c3f92f0a81ea78282145bd536d80fe5f717462c9d11c6c')
-    version('1.1.0', sha256='eb660821bed20c269dbacb5630fd8e9200012b8fbec2bdf63b0a5237773ea165')
-    version('1.0.0', sha256='06fe9162e0ef561ca00b32766daa2196587d2faefaea8fa28f72af202b046587')
-    version('0.9.2', sha256='ef67b057b4fc4ce463a7303688d45c50a7e420e8b4b3dabcd443cb265d4081b5')
-    version('0.9.1', sha256='e22d2e24cc97a03db24aa8d96cb0fc66ca110adabc321215f5feca2f1068d29a')
-    version('0.9.0', sha256='b1d395d1af3922edbfdbd05ac7082d855a2613aff2cd949ff0f29e25fb51f7f3')
+    version('2.4.0', sha256='05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c')
+    version('2.3.0', sha256='e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f')
+    version('2.2.0', sha256='35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8')
+    version('2.1.1', sha256='d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2')
+    version('2.1.0', sha256='5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d')
+    version('1.6.0', sha256='8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805')
+    version('1.5.0', sha256='aa0d4dff45c0cc2214ba158d29280f8fa1129f3e87858ef825930845146337f4')
+    version('1.4.0', sha256='05c8a1702088e9b54acb422f78210afc6074b3472afa7a0a77f0b8aa3f5db605')
+    version('1.3.0', sha256='a4f93317c97a9d9ed71d6ecfe08b68e3de9fea3f4d94dcd1d9d83ccbf929bc31')
+    version('1.2.3', sha256='2e4a1b636d8809d8f0a69f341acf15b2e401a3221ede11be439911d23ce2139e')
+    version('1.2.2', sha256='58741f9d3bffeba8f88452c1eddcf1b3eee464560e4589e4b81de8b3c9e42e4d')
+    version('1.2.1', sha256='7e5e3a5e7ce8d1afb9cbcff2bb10cffaf83e1d94ab7c78eb86a715a88c32e22f')
+    version('1.2.0', sha256='3633e000ffdc307ff1a7d7450e895ff8813e20b084ef263b5669eef9bc4c7a52')
+    version('1.1.0', sha256='e5f959931987e2be178781554b485d52342ec9f1b43f891d2dad07a691c7a89a')
+    version('0.9.2', sha256='02691c23ce699f252874b7c27f14cf26e3d4e82b58e5d584f000b7ab5be36a5f')
+    version('0.9.1', sha256='baad29ac1e884c7077eb32ed1d9ee5cf30bf4b888329e1fcb51b9aa5298cb3b9')
+    version('0.9.0', sha256='4c4d73085ce5de9d8147011c060d129659baa1111d1a5a3035f2bd03f2976538')
 
     depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
     # Most Python packages only require py-setuptools as a build dependency.