[pkgsrc/trunk]: pkgsrc/time pytest from versioned depends

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cb93caf4295
branches:  trunk
changeset: 432029:6cb93caf4295
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon May 18 10:40:11 2020 +0000

description:
pytest from versioned depends

diffstat:

 time/khal/Makefile        |  9 ++++-----
 time/py-dateutil/Makefile |  6 ++++--
 time/py-iso8601/Makefile  |  7 ++++---
 time/py-jdcal/Makefile    |  5 +++--
 time/py-tempora/Makefile  |  8 +++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diffs (133 lines):

diff -r 51d7a60500a2 -r 6cb93caf4295 time/khal/Makefile
--- a/time/khal/Makefile        Mon May 18 10:38:13 2020 +0000
+++ b/time/khal/Makefile        Mon May 18 10:40:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/10/21 22:15:10 adam Exp $
+# $NetBSD: Makefile,v 1.30 2020/05/18 10:40:11 adam Exp $
 
 DISTNAME=              khal-0.10.1
 PKGREVISION=           1
@@ -31,9 +31,8 @@
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinxcontrib-newsfeed-[0-9]*:../../textproc/py-sphinxcontrib-newsfeed
 # 0.9.10: one test failure https://github.com/pimutils/khal/issues/825
-# TEST_DEPENDS
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=         ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
+TEST_DEPENDS+=         ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # not supported as of 0.8.0
 
@@ -49,7 +48,7 @@
        ${INSTALL_MAN} ${WRKSRC}/doc/build/man/khal.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 do-test:
-       cd ${WRKSRC} && py.test-${PYVERSSUFFIX} tests
+       cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff -r 51d7a60500a2 -r 6cb93caf4295 time/py-dateutil/Makefile
--- a/time/py-dateutil/Makefile Mon May 18 10:38:13 2020 +0000
+++ b/time/py-dateutil/Makefile Mon May 18 10:40:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/11/06 20:49:22 adam Exp $
+# $NetBSD: Makefile,v 1.28 2020/05/18 10:40:11 adam Exp $
 
 DISTNAME=      python-dateutil-2.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -14,10 +14,12 @@
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 51d7a60500a2 -r 6cb93caf4295 time/py-iso8601/Makefile
--- a/time/py-iso8601/Makefile  Mon May 18 10:38:13 2020 +0000
+++ b/time/py-iso8601/Makefile  Mon May 18 10:40:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/07/28 07:16:28 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/18 10:40:11 adam Exp $
 
 DISTNAME=      iso8601-0.1.12
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,12 +10,13 @@
 COMMENT=       Simple Python module to parse ISO 8601 dates
 LICENSE=       mit
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
 do-test:
-       cd ${WRKSRC} && py.test-${PYVERSSUFFIX} --verbose iso8601
+       cd ${WRKSRC} && pytest-${PYVERSSUFFIX} iso8601/test_iso8601.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 51d7a60500a2 -r 6cb93caf4295 time/py-jdcal/Makefile
--- a/time/py-jdcal/Makefile    Mon May 18 10:38:13 2020 +0000
+++ b/time/py-jdcal/Makefile    Mon May 18 10:40:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/05/05 04:59:38 adam Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/18 10:40:11 adam Exp $
 
 DISTNAME=      jdcal-1.4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@
 COMMENT=       Julian dates from proleptic Gregorian and Julian calendars
 LICENSE=       modified-bsd
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -18,4 +18,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_jdcal.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 51d7a60500a2 -r 6cb93caf4295 time/py-tempora/Makefile
--- a/time/py-tempora/Makefile  Mon May 18 10:38:13 2020 +0000
+++ b/time/py-tempora/Makefile  Mon May 18 10:40:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/04/19 10:01:13 adam Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/18 10:40:11 adam Exp $
 
 DISTNAME=      tempora-1.14.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,17 +15,19 @@
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.8:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar>=0.9.1:../../devel/py-test-sugar
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} calc-prorate calc-prorate${PYVERSSUFFIX} || ${TRUE}
 
 do-test:
-       cd ${WRKSRC}/tests && py.test-${PYVERSSUFFIX}
+       cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"