recipe: add version 6.1.1 for pytest (#20831)

* recipe: add version 6.1.1 for pytest

add recipe for new dependency py-iniconfig
recipe: add version 6.1.1 for pytest

add recipe for new dependency py-iniconfig

* fix: 'SyntaxError: invalid syntax' during unittests

* requested changes on the pull request done

* requested changes on dep for py-pytest

* change constaint on python for importlib-metadata

* undo change on py-importlib-metada as requested

* bug fix

* bug fix on py-wcwidth

* fix as requested

* forget @ in when param

* forget a colon

* add new versions py-pytest and py-py

* fix setuptools* version

* add rule for more-itertools

3 files changed, 37 insertions, 7 deletions

diff --git a/var/spack/repos/builtin/packages/py-iniconfig/package.py b/var/spack/repos/builtin/packages/py-iniconfig/package.py
new file mode 100644
index 0000000000..e658aba1d6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-iniconfig/package.py
@@ -0,0 +1,18 @@
+# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class PyIniconfig(PythonPackage):
+    """
+    iniconfig: brain-dead simple parsing of ini files
+    """
+
+    pypi     = "iniconfig/iniconfig-1.1.1.tar.gz"
+
+    version('1.1.1', sha256='bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32')
+
+    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py
index b48ac9f941..f122e5cdb6 100644
--- a/var/spack/repos/builtin/packages/py-py/package.py
+++ b/var/spack/repos/builtin/packages/py-py/package.py
@@ -12,6 +12,8 @@ class PyPy(PythonPackage):
     homepage = "http://pylib.readthedocs.io/en/latest/"
     pypi = "py/py-1.8.0.tar.gz"
 
+    version('1.9.0', sha256='9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342')
+    version('1.8.2', sha256='f3b3a4c36512a4c4f024041ab51866f11761cc169670204b235f6b20523d4e6b')
     version('1.8.0', sha256='dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53')
     version('1.5.4',  sha256='3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7')
     version('1.5.3',  sha256='29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881')
diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py
index 7162276b84..6a453178a5 100644
--- a/var/spack/repos/builtin/packages/py-pytest/package.py
+++ b/var/spack/repos/builtin/packages/py-pytest/package.py
@@ -10,8 +10,10 @@ class PyPytest(PythonPackage):
     """pytest: simple powerful testing with Python."""
 
     homepage = "http://pytest.org/"
-    pypi = "pytest/pytest-5.2.1.tar.gz"
+    pypi      = "pytest/pytest-5.2.1.tar.gz"
 
+    version('6.2.1', sha256='66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306')
+    version('6.1.1', sha256='8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92')
     version('5.3.4', sha256='1d122e8be54d1a709e56f82e2d85dcba3018313d64647f38a91aec88c239b600')
     version('5.2.1', sha256='ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0')
     version('5.1.1', sha256='c3d5020755f70c82eceda3feaf556af9a341334414a8eca521a18f463bcead88')
@@ -25,7 +27,8 @@ class PyPytest(PythonPackage):
     version('3.0.7', sha256='b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab')
     version('3.0.2', sha256='64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339')
 
-    depends_on('python@3.5:', when='@5:', type=('build', 'run'))
+    depends_on('python@3.6:', when='@6.2.0', type=('build', 'run'))
+    depends_on('python@3.5:', when='@5:6.1.999', type=('build', 'run'))
     depends_on('python@2.7:2.8,3.4:', when='@3.3:4', type=('build', 'run'))
     depends_on('python@2.6:2.8,3.3:', when='@:3.2', type=('build', 'run'))
 
@@ -33,21 +36,26 @@ class PyPytest(PythonPackage):
     # However, pytest requires setuptools during runtime as well.
     # FIXME: May no longer be needed at runtime, see:
     # https://github.com/pytest-dev/pytest/pull/5063
-    depends_on('py-setuptools@40.0:', when='@3.9.2:', type=('build', 'run'))
+    depends_on('py-setuptools@42.0:', when='@6.2:', type=('build', 'run'))
+    depends_on('py-setuptools@40.0:', when='@3.9.2:6.1.999', type=('build', 'run'))
     depends_on('py-setuptools@30.3:', when='@3.9.0:3.9.1', type=('build', 'run'))
     depends_on('py-setuptools', type=('build', 'run'))
+    depends_on('py-setuptools-scm@3.4:', when='@6.2:', type=('build', 'run'))
     depends_on('py-setuptools-scm', when='@3.1:', type='build')
-    depends_on('py-py@1.5.0:', when='@3.3:', type=('build', 'run'))
+    depends_on('py-py@1.8.2:', when='@6:', type=('build', 'run'))
+    depends_on('py-py@1.5.0:', when='@3.3:5.999', type=('build', 'run'))
     depends_on('py-py@1.4.33:', when='@3.1.2:3.2.3,3.2.5:3.2.999', type=('build', 'run'))
     depends_on('py-py@1.4.33:1.4.999', when='@3.2.4', type=('build', 'run'))
     depends_on('py-py@1.4.29:', when='@:3.1.1', type=('build', 'run'))
     depends_on('py-six@1.10.0:', when='@3.3:4', type=('build', 'run'))
     depends_on('py-packaging', when='@4.6:', type=('build', 'run'))
+    depends_on('py-attrs@19.2.0:', when='@6.2:', type=('build', 'run'))
+    depends_on('py-attrs@17.4.0:', when='@3.5:6.1.999', type=('build', 'run'))
     depends_on('py-attrs@17.2.0:', when='@3.3:3.4', type=('build', 'run'))
-    depends_on('py-attrs@17.4.0:', when='@3.5:', type=('build', 'run'))
-    depends_on('py-more-itertools@4.0.0:', when='@3.5.1:', type=('build', 'run'))
+    depends_on('py-more-itertools@4.0.0:', when='@3.5.1:5.999', type=('build', 'run'))
     depends_on('py-more-itertools@4.0.0:6.0.0', when='@4.2.1:4.6.9 ^python@:2', type=('build', 'run'))
     depends_on('py-atomicwrites@1.0:', when='@3.6:5.2.999', type=('build', 'run'))
+    depends_on('py-pluggy@0.12:1.0.0', when='@6.2.1.', type=('build', 'run'))
     depends_on('py-pluggy@0.12:0.999', when='@4.6:', type=('build', 'run'))
     depends_on('py-pluggy@0.9.0:0.9.999,0.11:0.999', when='@4.5.0:4.5.999', type=('build', 'run'))
     depends_on('py-pluggy@0.11:', when='@4.4.2:4.4.999', type=('build', 'run'))
@@ -61,4 +69,6 @@ class PyPytest(PythonPackage):
     depends_on('py-pathlib2', when='@3.7.0 ^python@:3.5', type=('build', 'run'))
     depends_on('py-importlib-metadata@0.12:', when='@4.6:5.0', type=('build', 'run'))
     depends_on('py-importlib-metadata@0.12:', when='@5.1: ^python@:3.7', type=('build', 'run'))
-    depends_on('py-wcwidth', when='@4.5:', type=('build', 'run'))
+    depends_on('py-wcwidth', when='@4.5:5.999', type=('build', 'run'))
+    depends_on('py-iniconfig', when='@6.0:', type=('build', 'run'))
+    depends_on('py-toml', when='@6.0:', type=('build', 'run'))