CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 16 09:09:05 UTC 2020

Modified Files:
        pkgsrc/devel/py-behave: Makefile
        pkgsrc/devel/py-bugzilla: Makefile
        pkgsrc/devel/py-cffi: Makefile
        pkgsrc/devel/py-coverage: Makefile
        pkgsrc/devel/py-dash: Makefile

Log Message:
pytest from versioned depends


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-behave/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-bugzilla/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/py-cffi/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/py-coverage/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-dash/Makefile

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

Modified files:

Index: pkgsrc/devel/py-behave/Makefile
diff -u pkgsrc/devel/py-behave/Makefile:1.2 pkgsrc/devel/py-behave/Makefile:1.3
--- pkgsrc/devel/py-behave/Makefile:1.2 Wed Jul  3 07:19:03 2019
+++ pkgsrc/devel/py-behave/Makefile     Sat May 16 09:09:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/07/03 07:19:03 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      behave-1.2.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-hamcrest>=
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=1.1:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose>=1.3:../../devel/py-nose
 TEST_DEPENDS+= ${PYPKGPREFIX}-path.py>=10.1:../../devel/py-path.py
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -34,4 +35,5 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-bugzilla/Makefile
diff -u pkgsrc/devel/py-bugzilla/Makefile:1.2 pkgsrc/devel/py-bugzilla/Makefile:1.3
--- pkgsrc/devel/py-bugzilla/Makefile:1.2       Fri Jan  4 08:49:33 2019
+++ pkgsrc/devel/py-bugzilla/Makefile   Sat May 16 09:09:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/01/04 08:49:33 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      python-bugzilla-2.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,8 @@ COMMENT=      Bugzilla XMLRPC access module
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -30,4 +31,5 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-cffi/Makefile
diff -u pkgsrc/devel/py-cffi/Makefile:1.43 pkgsrc/devel/py-cffi/Makefile:1.44
--- pkgsrc/devel/py-cffi/Makefile:1.43  Sun Mar  8 16:42:26 2020
+++ pkgsrc/devel/py-cffi/Makefile       Sat May 16 09:09:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/03/08 16:42:26 bsiegert Exp $
+# $NetBSD: Makefile,v 1.44 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      cffi-1.14.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,8 @@ USE_LANGUAGES=        c c++ # c++ for testing o
 USE_TOOLS+=    pkg-config
 
 DEPENDS+=      ${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 DISTUTILS_BUILDDIR_IN_TEST_ENV=        yes
 
@@ -29,4 +30,5 @@ do-test:
 
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-coverage/Makefile
diff -u pkgsrc/devel/py-coverage/Makefile:1.24 pkgsrc/devel/py-coverage/Makefile:1.25
--- pkgsrc/devel/py-coverage/Makefile:1.24      Mon May  4 04:39:15 2020
+++ pkgsrc/devel/py-coverage/Makefile   Sat May 16 09:09:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2020/05/04 04:39:15 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      coverage-5.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,11 @@ LICENSE=    modified-bsd
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.4.0:../../devel/py-flaky
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.2.5:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.20.1:../../devel/py-test-xdist
 TEST_DEPENDS+= ${PYPKGPREFIX}-unittest-mixins-[0-9]*:../../devel/py-unittest-mixins
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 PYSETUPTESTTARGET=     pytest
 
 # https://github.com/nedbat/coveragepy/issues/983
@@ -26,4 +27,5 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/bin/coverage ${DESTDIR}${PREFIX}/bin/coverage[23]
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-dash/Makefile
diff -u pkgsrc/devel/py-dash/Makefile:1.8 pkgsrc/devel/py-dash/Makefile:1.9
--- pkgsrc/devel/py-dash/Makefile:1.8   Sat Dec 14 10:52:18 2019
+++ pkgsrc/devel/py-dash/Makefile       Sat May 16 09:09:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/12/14 10:52:18 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      pydash-4.7.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -11,13 +11,15 @@ COMMENT=    Python utility libraries for do
 LICENSE=       mit
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"