Sat May 16 17:42:42 2020 UTC ()
pytest from versioned depends


(adam)
diff -r1.18 -r1.19 pkgsrc/devel/py-wheel/Makefile
diff -r1.2 -r1.3 pkgsrc/filesystems/py-fs/Makefile
diff -r1.25 -r1.26 pkgsrc/finance/py-stripe/Makefile
diff -r1.49 -r1.50 pkgsrc/graphics/py-Pillow/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/py-blurhash/Makefile

cvs diff -r1.18 -r1.19 pkgsrc/devel/py-wheel/Makefile (expand / switch to context diff)
--- pkgsrc/devel/py-wheel/Makefile 2020/02/01 20:19:44 1.18
+++ pkgsrc/devel/py-wheel/Makefile 2020/05/16 17:42:41 1.19
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/02/01 20:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.19 2020/05/16 17:42:41 adam Exp $
 
 DISTNAME=	wheel-0.34.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,8 @@
 COMMENT=	Built-package format for Python
 LICENSE=	mit
 
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.0.0:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 USE_LANGUAGES=	# none
 

cvs diff -r1.2 -r1.3 pkgsrc/filesystems/py-fs/Makefile (expand / switch to context diff)
--- pkgsrc/filesystems/py-fs/Makefile 2019/12/13 11:22:51 1.2
+++ pkgsrc/filesystems/py-fs/Makefile 2020/05/16 17:42:41 1.3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/12/13 11:22:51 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 17:42:41 adam Exp $
 
 DISTNAME=	fs-2.4.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@
 DEPENDS+=	${PYPKGPREFIX}-six>=1.10:../../lang/py-six
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-pyftpdlib-[0-9]*:../../net/py-pyftpdlib
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27

cvs diff -r1.25 -r1.26 pkgsrc/finance/py-stripe/Makefile (expand / switch to context diff)
--- pkgsrc/finance/py-stripe/Makefile 2020/05/12 06:51:27 1.25
+++ pkgsrc/finance/py-stripe/Makefile 2020/05/16 17:42:42 1.26
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/05/12 06:51:27 adam Exp $
+# $NetBSD: Makefile,v 1.26 2020/05/16 17:42:42 adam Exp $
 
 DISTNAME=	stripe-2.48.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,12 +12,14 @@
 
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.20:../../devel/py-requests
 # tests require stripe-mock
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.4:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov>=2.5:../../devel/py-test-cov
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-mock>=1.7:../../devel/py-test-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist>=1.22:../../devel/py-test-xdist
 
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

cvs diff -r1.49 -r1.50 pkgsrc/graphics/py-Pillow/Makefile (expand / switch to context diff)
--- pkgsrc/graphics/py-Pillow/Makefile 2020/01/26 17:31:22 1.49
+++ pkgsrc/graphics/py-Pillow/Makefile 2020/05/16 17:42:42 1.50
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2020/01/26 17:31:22 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2020/05/16 17:42:42 adam Exp $
 
 DISTNAME=	Pillow-6.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,6 @@
 DEPENDS+=	${PYPKGPREFIX}-olefile-[0-9]*:../../devel/py-olefile
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"

cvs diff -r1.1 -r1.2 pkgsrc/graphics/py-blurhash/Makefile (expand / switch to context diff)
--- pkgsrc/graphics/py-blurhash/Makefile 2020/03/05 20:36:44 1.1
+++ pkgsrc/graphics/py-blurhash/Makefile 2020/05/16 17:42:42 1.2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/05 20:36:44 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 17:42:42 adam Exp $
 
 DISTNAME=	blurhash-1.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,11 +10,13 @@
 COMMENT=	Implementation of the blurhash algorithm in pure python
 LICENSE=	mit
 
+TEST_DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
+TEST_DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
+
 USE_LANGUAGES=	# none
 
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-TEST_DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
-TEST_DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"