py-pytest: add v6.2.4 (#25240)

1 files changed, 26 insertions, 22 deletions

diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py
index 4de83b358d..6dce964724 100644
--- a/var/spack/repos/builtin/packages/py-pytest/package.py
+++ b/var/spack/repos/builtin/packages/py-pytest/package.py
@@ -12,6 +12,7 @@ class PyPytest(PythonPackage):
     homepage = "http://pytest.org/"
     pypi      = "pytest/pytest-5.2.1.tar.gz"
 
+    version('6.2.4', sha256='50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b')
     version('6.2.1', sha256='66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306')
     version('6.1.1', sha256='8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92')
     version('5.3.4', sha256='1d122e8be54d1a709e56f82e2d85dcba3018313d64647f38a91aec88c239b600')
@@ -28,35 +29,26 @@ class PyPytest(PythonPackage):
     version('3.0.7', sha256='b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab')
     version('3.0.2', sha256='64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339')
 
-    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'))
+    # python_requires
+    depends_on('python@3.6:', when='@6.2:', type=('build', 'run'))
+    depends_on('python@3.5:', when='@5:6.1', 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'))
 
-    # Most Python packages only require setuptools as a build dependency.
-    # 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
+    # setup_requires
     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@3.4:', when='@6.2:', type='build')
     depends_on('py-setuptools-scm', when='@3.1:', type='build')
-    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'))
+
+    # install_requires
     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-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-iniconfig', when='@6.0:', type=('build', 'run'))
+    depends_on('py-packaging', when='@4.6:', 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'))
@@ -64,12 +56,24 @@ class PyPytest(PythonPackage):
     depends_on('py-pluggy@0.7:', when='@3.7:4.3', type=('build', 'run'))
     depends_on('py-pluggy@0.5:0.7', when='@3.6.4:3.6.999', type=('build', 'run'))
     depends_on('py-pluggy@0.5:0.6', when='@:3.6.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-toml', when='@6.0:', type=('build', 'run'))
+    depends_on('py-atomicwrites@1.0:', when='@5.3: platform=win32', type=('build', 'run'))
+    depends_on('py-atomicwrites@1.0:', when='@3.6:5.2.999', type=('build', 'run'))
+    depends_on('py-colorama', when='platform=win32', 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'))
+
+    # Historic dependencies
+    depends_on('py-six@1.10.0:', when='@3.3:4', 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-funcsigs@1.0:', when='@4.4: ^python@:2', type=('build', 'run'))
     depends_on('py-funcsigs', when='@3.3:4.3 ^python@:2', type=('build', 'run'))
     depends_on('py-pathlib2@2.2.0:', when='@3.7.1: ^python@:3.5', type=('build', 'run'))
     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: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'))