From 048cc711d6398dad91af3f0c326b38d45ae3d9f6 Mon Sep 17 00:00:00 2001 From: Jordan Galby <67924449+Jordan474@users.noreply.github.com> Date: Sun, 30 Jul 2023 22:01:00 +0200 Subject: py-pytest-html: Add version 3.2.0 (#38989) * py-pytest-html: add 3.2.0 * py-pytest-html: Add py-py version requirement See https://github.com/pytest-dev/pytest-html/blob/v3.2.0/setup.py#L16 * py-pytest-html: Add dependencies from setup.py and pyproject.toml * py-pytest-html: Add git url * py-pytest-html: Add conflict with py-pytest@7.2: pending py-pytest-html@4 --- .../builtin/packages/py-pytest-html/package.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pytest-html/package.py b/var/spack/repos/builtin/packages/py-pytest-html/package.py index bfc5a4f9ad..3809558543 100644 --- a/var/spack/repos/builtin/packages/py-pytest-html/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-html/package.py @@ -13,11 +13,29 @@ class PyPytestHtml(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-html" pypi = "pytest-html/pytest-html-3.1.1.tar.gz" + git = "https://github.com/pytest-dev/pytest-html.git" + version("3.2.0", sha256="c4e2f4bb0bffc437f51ad2174a8a3e71df81bbc2f6894604e604af18fbe687c3") version("3.1.1", sha256="3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3") depends_on("python@3.6:", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-setuptools-scm", type="build") + depends_on("py-setuptools@42:", type="build") + depends_on("py-setuptools-scm+toml@3.5.0:", type="build") + depends_on("py-setuptools-scm-git-archive@1.1:", type="build") + depends_on("py-wheel@0.33.6:", type="build") depends_on("py-pytest@5.0:5,6.0.1:", type=("build", "run")) depends_on("py-pytest-metadata", type=("build", "run")) + + # https://github.com/spack/spack/pull/38989 + # py-pytest@7.2 removed py-py dependency, but now py-pytest conflicts with py-py. And + # py-pytest-htm@:3 requires py-py. + # One workaround is to always add py-py *before* py-pytest in PYTHONPATH, but we cannot ensure + # that. So don't allow this configuration, pending py-pytest-html@4. + conflicts("^py-pytest@7.2:", when="@:3") + + @run_after("install") + @on_package_attributes(run_tests=True) + def check_build(self): + # Simplest test: pytest will load pytest-html plugin + output = python("-m", "pytest", "-VV", output=str, error=str) + assert self.prefix in output, f"Missing pytest-html in {output!r}" -- cgit v1.2.3-60-g2f50