From 57aa030e1c974cd41e121d2f9dec80b6d157e7f3 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 30 Aug 2023 23:39:39 -0700 Subject: [PATCH] devel/py-pytest-cov: Upgrade from 2.9.0 to 4.1.0 This is required so py-pytest-cov is functional with newer versions of py-pytest-xdist [1]. While here, appease portlint by shifting where variables (`CONFLICTS`, etc) are defined. 1. https://github.com/pytest-dev/pytest-cov/issues/422 PR: 269360 Reviewed by: yuri Approved by: dbaio (maintainer timeout; 5 months) Co-Authored By: Yuri Victorovich Differential Revision: https://reviews.freebsd.org/D39035 --- devel/py-pytest-cov/Makefile | 20 ++++++++++++++------ devel/py-pytest-cov/distinfo | 6 +++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/devel/py-pytest-cov/Makefile b/devel/py-pytest-cov/Makefile index a3d2ae3b34a78..3167ca5c439c7 100644 --- a/devel/py-pytest-cov/Makefile +++ b/devel/py-pytest-cov/Makefile @@ -1,5 +1,5 @@ PORTNAME= pytest-cov -PORTVERSION= 2.9.0 +PORTVERSION= 4.1.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,14 +11,22 @@ WWW= https://github.com/pytest-dev/pytest-cov LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest4-cov - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4:devel/py-coverage@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=5.2.1:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fields>0:devel/py-fields@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hunter>0:devel/py-hunter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}process-tests>0:devel/py-process-tests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} -USES= python -USE_PYTHON= autoplist concurrent distutils +USES= python:3.7+ +USE_PYTHON= autoplist concurrent distutils pytest + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest4-cov NO_ARCH= yes +TEST_ARGS+= -p pytester + .include diff --git a/devel/py-pytest-cov/distinfo b/devel/py-pytest-cov/distinfo index dfe93af0583b8..013f5d03b6b24 100644 --- a/devel/py-pytest-cov/distinfo +++ b/devel/py-pytest-cov/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590933452 -SHA256 (pytest-cov-2.9.0.tar.gz) = b6a814b8ed6247bd81ff47f038511b57fe1ce7f4cc25b9106f1a4b106f1d9322 -SIZE (pytest-cov-2.9.0.tar.gz) = 54269 +TIMESTAMP = 1691204295 +SHA256 (pytest-cov-4.1.0.tar.gz) = 3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6 +SIZE (pytest-cov-4.1.0.tar.gz) = 63245