py-pytest: add v8.2.1 (#44267)

* py-pytest: add v8.2.1
* py-pluggy: add v1.5.0

2 files changed, 63 insertions, 54 deletions

diff --git a/var/spack/repos/builtin/packages/py-pluggy/package.py b/var/spack/repos/builtin/packages/py-pluggy/package.py
index 2efde37f3b..4c68dc482a 100644
--- a/var/spack/repos/builtin/packages/py-pluggy/package.py
+++ b/var/spack/repos/builtin/packages/py-pluggy/package.py
@@ -14,6 +14,7 @@ class PyPluggy(PythonPackage):
 
     license("MIT")
 
+    version("1.5.0", sha256="2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1")
     version("1.4.0", sha256="8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be")
     version("1.0.0", sha256="4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159")
     version("0.13.0", sha256="fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34")
@@ -23,10 +24,13 @@ class PyPluggy(PythonPackage):
     version("0.7.1", sha256="95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1")
     version("0.6.0", sha256="7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff")
 
-    depends_on("python@3.8:", when="@1.3:", type=("build", "run"))
-    depends_on("python@3.7:", when="@1.1:", type=("build", "run"))
-    depends_on("py-setuptools@45:", when="@1.1:", type="build")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools-scm@6.2.3:+toml", when="@1.1:", type="build")
-    depends_on("py-setuptools-scm", type="build")
-    depends_on("py-importlib-metadata@0.12:", when="^python@:3.7", type=("build", "run"))
+    with default_args(type="build"):
+        depends_on("py-setuptools@45:", when="@1.1:")
+        depends_on("py-setuptools")
+        depends_on("py-setuptools-scm@6.2.3:+toml", when="@1.1:")
+        depends_on("py-setuptools-scm")
+
+    with default_args(type=("build", "run")):
+        depends_on("python@3.8:", when="@1.3:")
+        depends_on("python@3.7:", when="@1.1:")
+        depends_on("py-importlib-metadata@0.12:", when="^python@:3.7")
diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py
index 5a4ef2d5f0..1e50386ac6 100644
--- a/var/spack/repos/builtin/packages/py-pytest/package.py
+++ b/var/spack/repos/builtin/packages/py-pytest/package.py
@@ -14,7 +14,9 @@ class PyPytest(PythonPackage):
     git = "https://github.com/pytest-dev/pytest"
 
     license("MIT")
+    maintainers("adamjstewart")
 
+    version("8.2.1", sha256="5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd")
     version("8.0.0", sha256="249b1b0864530ba251b7438274c4d251c58d868edaaec8762893ad4a0d71c36c")
     version("7.4.4", sha256="2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280")
     version("7.3.2", sha256="ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b")
@@ -39,53 +41,56 @@ class PyPytest(PythonPackage):
     version("3.0.7", sha256="b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab")
     version("3.0.2", sha256="64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339")
 
-    # python_requires
-    depends_on("python@3.8:", when="@8:", type=("build", "run"))
-    depends_on("python@3.7:", when="@7.1:", type=("build", "run"))
-    # see https://github.com/pytest-dev/pytest/releases/tag/7.3.2
-    depends_on("python@:3.11", when="@:7.3.1", type=("build", "run"))
+    with default_args(type="build"):
+        depends_on("py-setuptools@61:", when="@8.1:")
+        depends_on("py-setuptools@45:", when="@7:")
+        depends_on("py-setuptools@42:", when="@6.2:")
+        depends_on("py-setuptools@40:", when="@3.9.2:6.1")
+        depends_on("py-setuptools@30.3:", when="@3.9.0:3.9.1")
+        depends_on("py-setuptools")
+        depends_on("py-setuptools-scm@6.2.3:+toml", when="@7:")
+        depends_on("py-setuptools-scm@3.4:+toml", when="@6.2:")
+        depends_on("py-setuptools-scm", when="@3.1:")
 
-    # setup_requires
-    depends_on("py-setuptools@45.0:", when="@7:", 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", 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@6.2.3: +toml", when="@7:", type="build")
-    depends_on("py-setuptools-scm@3.4: +toml", when="@6.2:", type="build")
-    depends_on("py-setuptools-scm", when="@3.1:", type="build")
+    with default_args(type=("build", "run")):
+        depends_on("python@3.8:", when="@8:")
+        depends_on("python@3.7:", when="@7.1:")
+        # see https://github.com/pytest-dev/pytest/releases/tag/8.2.1
+        depends_on("python@:3.12", when="@:8.2.0")
+        # see https://github.com/pytest-dev/pytest/releases/tag/7.3.2
+        depends_on("python@:3.11", when="@:7.3.1")
 
-    # install_requires
-    depends_on("py-iniconfig", when="@6.0:", type=("build", "run"))
-    depends_on("py-packaging", when="@4.6:", type=("build", "run"))
-    depends_on("py-pluggy@1.3:1", when="@8:", type=("build", "run"))
-    depends_on("py-pluggy@0.12:1", when="@6.2:7", type=("build", "run"))
-    depends_on("py-pluggy@0.12:0", when="@4.6:6.1", type=("build", "run"))
-    depends_on("py-pluggy@0.9.0:0.9,0.11:0", when="@4.5.0:4.5", type=("build", "run"))
-    depends_on("py-pluggy@0.11:", when="@4.4.2:4.4", type=("build", "run"))
-    depends_on("py-pluggy@0.9:", when="@4.4.0:4.4.1", type=("build", "run"))
-    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", type=("build", "run"))
-    depends_on("py-pluggy@0.5:0.6", when="@:3.6.3", type=("build", "run"))
-    depends_on("py-colorama", when="platform=windows", type=("build", "run"))
-    depends_on("py-exceptiongroup@1:", when="@7: ^python@:3.10", type=("build", "run"))
-    depends_on("py-importlib-metadata@0.12:", when="@5.1: ^python@:3.7", type=("build", "run"))
-    depends_on("py-importlib-metadata@0.12:", when="@4.6:5.0", type=("build", "run"))
-    depends_on("py-tomli@1:", when="@7.1: ^python@:3.10", type=("build", "run"))
-    depends_on("py-tomli@1:", when="@7.0", type=("build", "run"))
+        depends_on("py-colorama", when="platform=windows")
+        depends_on("py-exceptiongroup@1:", when="@7:^python@:3.10")
+        depends_on("py-iniconfig", when="@6.0:")
+        depends_on("py-packaging", when="@4.6:")
+        depends_on("py-pluggy@1.5:1", when="@8.2:")
+        depends_on("py-pluggy@1.3:1", when="@8:")
+        depends_on("py-pluggy@0.12:1", when="@6.2:7")
+        depends_on("py-pluggy@0.12:0", when="@4.6:6.1")
+        depends_on("py-pluggy@0.9.0:0.9,0.11:0", when="@4.5.0:4.5")
+        depends_on("py-pluggy@0.11:", when="@4.4.2:4.4")
+        depends_on("py-pluggy@0.9:", when="@4.4.0:4.4.1")
+        depends_on("py-pluggy@0.7:", when="@3.7:4.3")
+        depends_on("py-pluggy@0.5:0.7", when="@3.6.4:3.6")
+        depends_on("py-pluggy@0.5:0.6", when="@:3.6.3")
+        depends_on("py-tomli@1:", when="@7.1: ^python@:3.10")
+        depends_on("py-tomli@1:", when="@7.0")
 
-    # Historic dependencies
-    depends_on("py-attrs@19.2.0:", when="@6.2:7.2", type=("build", "run"))
-    depends_on("py-attrs@17.4.0:", when="@3.5:6.1", type=("build", "run"))
-    depends_on("py-attrs@17.2.0:", when="@3.3:3.4", type=("build", "run"))
-    depends_on("py-py@1.8.2:", when="@6:7.1", type=("build", "run"))
-    depends_on("py-py@1.5.0:", when="@3.3:5", type=("build", "run"))
-    depends_on("py-py@1.4.33:", when="@3.1.2:3.2.3,3.2.5:3.2", type=("build", "run"))
-    depends_on("py-py@1.4.33:1.4", when="@3.2.4", type=("build", "run"))
-    depends_on("py-py@1.4.29:", when="@:3.1.1", type=("build", "run"))
-    depends_on("py-atomicwrites@1.0:", when="@5.3:7.1.2 platform=windows", type=("build", "run"))
-    depends_on("py-atomicwrites@1.0:", when="@3.6:5.2", type=("build", "run"))
-    depends_on("py-toml", when="@6", type=("build", "run"))
-    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", type=("build", "run"))
-    depends_on("py-wcwidth", when="@4.5:5", type=("build", "run"))
+        # Historic dependencies
+        depends_on("py-importlib-metadata@0.12:", when="@5.1:^python@:3.7")
+        depends_on("py-importlib-metadata@0.12:", when="@4.6:5.0")
+        depends_on("py-attrs@19.2.0:", when="@6.2:7.2")
+        depends_on("py-attrs@17.4.0:", when="@3.5:6.1")
+        depends_on("py-attrs@17.2.0:", when="@3.3:3.4")
+        depends_on("py-py@1.8.2:", when="@6:7.1")
+        depends_on("py-py@1.5.0:", when="@3.3:5")
+        depends_on("py-py@1.4.33:", when="@3.1.2:3.2.3,3.2.5:3.2")
+        depends_on("py-py@1.4.33:1.4", when="@3.2.4")
+        depends_on("py-py@1.4.29:", when="@:3.1.1")
+        depends_on("py-atomicwrites@1.0:", when="@5.3:7.1.2 platform=windows")
+        depends_on("py-atomicwrites@1.0:", when="@3.6:5.2")
+        depends_on("py-toml", when="@6")
+        depends_on("py-six@1.10.0:", when="@3.3:4")
+        depends_on("py-more-itertools@4.0.0:", when="@3.5.1:5")
+        depends_on("py-wcwidth", when="@4.5:5")