summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/py-pluggy/package.py8
-rw-r--r--var/spack/repos/builtin/packages/py-pytest/package.py6
2 files changed, 10 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-pluggy/package.py b/var/spack/repos/builtin/packages/py-pluggy/package.py
index 0308e22d2d..2efde37f3b 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.4.0", sha256="8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be")
version("1.0.0", sha256="4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159")
version("0.13.0", sha256="fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34")
version("0.12.0", sha256="0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc")
@@ -22,9 +23,10 @@ class PyPluggy(PythonPackage):
version("0.7.1", sha256="95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1")
version("0.6.0", sha256="7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff")
- depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
- depends_on("python@3.6:", type=("build", "run"), when="@1.0.0:")
-
+ 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"))
diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py
index c1cee93543..5a4ef2d5f0 100644
--- a/var/spack/repos/builtin/packages/py-pytest/package.py
+++ b/var/spack/repos/builtin/packages/py-pytest/package.py
@@ -15,6 +15,8 @@ class PyPytest(PythonPackage):
license("MIT")
+ version("8.0.0", sha256="249b1b0864530ba251b7438274c4d251c58d868edaaec8762893ad4a0d71c36c")
+ version("7.4.4", sha256="2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280")
version("7.3.2", sha256="ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b")
version("7.2.1", sha256="d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42")
version("7.1.3", sha256="4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39")
@@ -38,6 +40,7 @@ class PyPytest(PythonPackage):
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"))
@@ -55,7 +58,8 @@ class PyPytest(PythonPackage):
# 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@0.12:1", when="@6.2:", 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"))