Add checksum for py-pylint@2.13.5 (#30356)

* Add checksum for py-pylint@2.13.5

* Update dependencies

* Add checksum for py-astroid@2.11.4

* Correct py-toml addition and add py-tomli dependency

* Remove py-pytoml dependency for versions @2.13:

* Modify py-astroid version range

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Discontinue py-astroid dependency @2.8.0:2.8 for new versions

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Discontinue py-mccabe dependency @0.6.0:0.6 for new versions

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Remove mccabe and setuptools-scm dependencies

* Update astroid dependencies

* Extend py-typed-ast version range to future releases

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* py-dill only required for version 2.13.5 and above

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Add maccabe dependency and correct setuptools run dependency

* Setuptools fix

* Add setuptools as run dependency

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

2 files changed, 18 insertions, 9 deletions

diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py
index 50d8b4e638..e2b693b6ae 100644
--- a/var/spack/repos/builtin/packages/py-astroid/package.py
+++ b/var/spack/repos/builtin/packages/py-astroid/package.py
@@ -13,6 +13,7 @@ class PyAstroid(PythonPackage):
     homepage = "https://github.com/PyCQA/astroid"
     pypi     = "astroid/astroid-2.8.3.tar.gz"
 
+    version('2.11.4', sha256='561dc6015eecce7e696ff7e3b40434bc56831afeff783f0ea853e19c4f635c06')
     version('2.8.3', sha256='0e361da0744d5011d4f5d57e64473ba9b7ab4da1e2d45d6631ebd67dd28c3cce')
     version('2.7.3', sha256='3b680ce0419b8a771aba6190139a3998d14b413852506d99aff8dc2bf65ee67c')
     version('2.5.6', sha256='8a398dfce302c13f14bab13e2b14fe385d32b73f4e4853b9bdfb64598baa1975')
@@ -36,6 +37,7 @@ class PyAstroid(PythonPackage):
     depends_on('python@3.4:', when='@2.0.0:', type=('build', 'run'))
     depends_on('python@3.5:', when='@2.3.3:', type=('build', 'run'))
     depends_on('python@3.6:', when='@2.5.6:', type=('build', 'run'))
+    depends_on('python@3.6.2:', when='@2.11.4:', type=('build', 'run'))
     depends_on('py-lazy-object-proxy', type=('build', 'run'))
     # Starting with astroid 2.3.1, astroid's dependencies were restricted
     # to a given minor version, c.f. commit e1b4e11.
@@ -45,13 +47,15 @@ class PyAstroid(PythonPackage):
     depends_on('py-six@1.12:1', when='@2.3.3:2.7.2', type=('build', 'run'))
     depends_on('py-wrapt', when='@:2.2', type=('build', 'run'))
     depends_on('py-wrapt@1.11:1.12', when='@2.3.3:2.8.2', type=('build', 'run'))
-    depends_on('py-wrapt@1.11:1.13', when='@2.8.3:', type=('build', 'run'))
+    depends_on('py-wrapt@1.11:1.13', when='@2.8.3:2.10', type=('build', 'run'))
+    depends_on('py-wrapt@1.11:1', when='@2.11:', type=('build', 'run'))
     depends_on('py-enum34@1.1.3:', when='^python@:3.3', type=('build', 'run'))
     depends_on('py-singledispatch', when='^python@:3.3', type=('build', 'run'))
     depends_on('py-backports-functools-lru-cache', when='^python@:3.2', type=('build', 'run'))
     depends_on('py-typed-ast@1.3.0:', when='@2.2.5:2.3.0 ^python@3.7.0:3.7')
-    depends_on('py-typed-ast@1.4.0:1.4', when='@2.3.1: ^python@:3.7', type=('build', 'run'))
+    depends_on('py-typed-ast@1.4.0:1.4', when='@2.3.1:2.8.4 ^python@:3.7', type=('build', 'run'))
+    depends_on('py-typed-ast@1.4.0:1', when='@2.8.5: ^python@:3.7', type=('build', 'run'))
     depends_on('py-typing-extensions@3.7.4:', when='@2.7.3: ^python@:3.7', type=('build', 'run'))
     depends_on('py-typing-extensions@3.10:', when='@2.8.3: ^python@:3.9', type=('build', 'run'))
-    depends_on('py-setuptools@17.1:', type='build')
-    depends_on('py-setuptools@20:', type='build', when='@2.7.3:')
+    depends_on('py-setuptools@17.1:', type=('build', 'run'))
+    depends_on('py-setuptools@20:', type=('build', 'run'), when='@2.7.3:')
diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py
index 4b39f43140..cba7f7f37b 100644
--- a/var/spack/repos/builtin/packages/py-pylint/package.py
+++ b/var/spack/repos/builtin/packages/py-pylint/package.py
@@ -16,6 +16,7 @@ class PyPylint(PythonPackage):
                       'pylint.message', 'pylint.utils', 'pylint.pyreverse',
                       'pylint.reporters', 'pylint.reporters.ureports']
 
+    version('2.13.5', sha256='dab221658368c7a05242e673c275c488670144123f4bd262b2777249c1c0de9b')
     version('2.11.1', sha256='2c9843fff1a88ca0ad98a256806c82c5a8f86086e7ccbdb93297d86c3f90c436')
     version('2.8.2', sha256='586d8fa9b1891f4b725f587ef267abe2a1bad89d6b184520c7f07a253dd6e217')
     version('2.3.1', sha256='723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1')
@@ -30,6 +31,7 @@ class PyPylint(PythonPackage):
     depends_on('python@2.7:2.8,3.4:3.6', when='@:1', type=('build', 'run'))
     depends_on('python@3.4:', when='@2:2.7', type=('build', 'run'))
     depends_on('python@3.6:', when='@2.8.2:', type=('build', 'run'))
+    depends_on('python@3.6.2:', when='@2.13.5:', type=('build', 'run'))
     depends_on('py-astroid', type=('build', 'run'))
     # note there is no working version of astroid for this
     depends_on('py-astroid@1.5.1:', type=('build', 'run'), when='@1.7:')
@@ -37,21 +39,24 @@ class PyPylint(PythonPackage):
     depends_on('py-astroid@2.0:', type=('build', 'run'), when='@2.2.0:')
     depends_on('py-astroid@2.2.0:2', type=('build', 'run'), when='@2.3.0:2.7')
     depends_on('py-astroid@2.5.6:2.6', type=('build', 'run'), when='@2.8.0:2.10')
-    depends_on('py-astroid@2.8.0:2.8', type=('build', 'run'), when='@2.11.1:')
-
+    depends_on('py-astroid@2.8.0:2.8', type=('build', 'run'), when='@2.11.1')
+    depends_on('py-astroid@2.11.2:2.11', type=('build', 'run'), when='@2.13.5:')
     depends_on('py-backports-functools-lru-cache', when='^python@:2.8', type=('build', 'run'))
     depends_on('py-configparser', when='^python@:2.8', type=('build', 'run'))
+    depends_on('py-dill@0.2:', when='@2.13.5:', type=('build', 'run'))
     depends_on('py-editdistance', type=('build', 'run'), when='@:1.7')
     depends_on('py-isort@4.2.5:', type=('build', 'run'))
     depends_on('py-isort@4.2.5:5', when='@2.3.1:', type=('build', 'run'))
     depends_on('py-mccabe', type=('build', 'run'))
-    depends_on('py-mccabe@0.6.0:0.6', when='@2.3.1:', type=('build', 'run'))
+    depends_on('py-mccabe@0.6.0:0.6', when='@2.3.1:2.11', type=('build', 'run'))
+    depends_on('py-mccabe@0.6.0:0.7', when='@2.13:', type=('build', 'run'))
     depends_on('py-pip', type=('build'))  # see https://github.com/spack/spack/issues/27075
     # depends_on('py-setuptools-scm@1.15.0:', type='build')
-    depends_on('py-setuptools-scm', type='build', when='@2.8.2:')
+    depends_on('py-setuptools-scm', type='build', when='@2.8.2')
     depends_on('py-setuptools@17.1:', type='build')
     depends_on('py-singledispatch', when='^python@:3.3', type=('build', 'run'))
     depends_on('py-six', type=('build', 'run'), when='@1:2.3.1')
-    depends_on('py-toml@0.7.1:', type=('build', 'run'), when='@2.8.2:')
+    depends_on('py-toml@0.7.1:', type=('build', 'run'), when='@2.8.2:2.12.2')
+    depends_on('py-tomli@1.1.0:', type=('build', 'run'), when='@2.13.5: ^python@:3.10')
     depends_on('py-platformdirs@2.2.0:', type=('build', 'run'), when='@2.11.1:')
     depends_on('py-typing-extensions@3.10.0:', type=('build', 'run'), when='@2.11.1: ^python@:3.9')