CVS commit: pkgsrc/time

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/time
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 18 May 2020 10:40:11 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon May 18 10:40:11 UTC 2020

Modified Files:
        pkgsrc/time/khal: Makefile
        pkgsrc/time/py-dateutil: Makefile
        pkgsrc/time/py-iso8601: Makefile
        pkgsrc/time/py-jdcal: Makefile
        pkgsrc/time/py-tempora: Makefile

Log Message:
pytest from versioned depends


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/time/khal/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/time/py-dateutil/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/py-iso8601/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/time/py-jdcal/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/time/py-tempora/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/khal/Makefile
diff -u pkgsrc/time/khal/Makefile:1.29 pkgsrc/time/khal/Makefile:1.30
--- pkgsrc/time/khal/Makefile:1.29      Mon Oct 21 22:15:10 2019
+++ pkgsrc/time/khal/Makefile   Mon May 18 10:40:11 2020
@@ -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 @@ USE_TOOLS+=           gmake
 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 @@ post-install:
        ${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"

Index: pkgsrc/time/py-dateutil/Makefile
diff -u pkgsrc/time/py-dateutil/Makefile:1.27 pkgsrc/time/py-dateutil/Makefile:1.28
--- pkgsrc/time/py-dateutil/Makefile:1.27       Wed Nov  6 20:49:22 2019
+++ pkgsrc/time/py-dateutil/Makefile    Mon May 18 10:40:11 2020
@@ -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 @@ DEPENDS+=   ${PYPKGPREFIX}-six>=1.5:../../
 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"

Index: pkgsrc/time/py-iso8601/Makefile
diff -u pkgsrc/time/py-iso8601/Makefile:1.3 pkgsrc/time/py-iso8601/Makefile:1.4
--- pkgsrc/time/py-iso8601/Makefile:1.3 Fri Jul 28 07:16:28 2017
+++ pkgsrc/time/py-iso8601/Makefile     Mon May 18 10:40:11 2020
@@ -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 @@ HOMEPAGE=   https://pypi.python.org/pypi/i
 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"

Index: pkgsrc/time/py-jdcal/Makefile
diff -u pkgsrc/time/py-jdcal/Makefile:1.6 pkgsrc/time/py-jdcal/Makefile:1.7
--- pkgsrc/time/py-jdcal/Makefile:1.6   Sun May  5 04:59:38 2019
+++ pkgsrc/time/py-jdcal/Makefile       Mon May 18 10:40:11 2020
@@ -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 @@ HOMEPAGE=     https://github.com/phn/jdcal
 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 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_jdcal.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/py-tempora/Makefile
diff -u pkgsrc/time/py-tempora/Makefile:1.11 pkgsrc/time/py-tempora/Makefile:1.12
--- pkgsrc/time/py-tempora/Makefile:1.11        Fri Apr 19 10:01:13 2019
+++ pkgsrc/time/py-tempora/Makefile     Mon May 18 10:40:11 2020
@@ -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}-pytz-[0-9]*:../
 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"

Prev by Date: Re: CVS commit: pkgsrc/games/eureka
Next by Date: CVS commit: pkgsrc/databases/py-sqlalchemy
Previous by Thread: CVS commit: pkgsrc/time/py-ligotimegps
Next by Thread: CVS commit: pkgsrc/databases/py-sqlalchemy
Indexes:

Home | Main Index | Thread Index | Old Index