CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 16 17:42:42 UTC 2020

Modified Files:
        pkgsrc/devel/py-wheel: Makefile
        pkgsrc/filesystems/py-fs: Makefile
        pkgsrc/finance/py-stripe: Makefile
        pkgsrc/graphics/py-Pillow: Makefile
        pkgsrc/graphics/py-blurhash: Makefile

Log Message:
pytest from versioned depends


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-wheel/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/py-fs/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/finance/py-stripe/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/py-Pillow/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/py-blurhash/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-wheel/Makefile
diff -u pkgsrc/devel/py-wheel/Makefile:1.18 pkgsrc/devel/py-wheel/Makefile:1.19
--- pkgsrc/devel/py-wheel/Makefile:1.18 Sat Feb  1 20:19:44 2020
+++ pkgsrc/devel/py-wheel/Makefile      Sat May 16 17:42:41 2020
@@ -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 @@ HOMEPAGE=     https://github.com/pypa/wheel
 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
 

Index: pkgsrc/filesystems/py-fs/Makefile
diff -u pkgsrc/filesystems/py-fs/Makefile:1.2 pkgsrc/filesystems/py-fs/Makefile:1.3
--- pkgsrc/filesystems/py-fs/Makefile:1.2       Fri Dec 13 11:22:51 2019
+++ pkgsrc/filesystems/py-fs/Makefile   Sat May 16 17:42:41 2020
@@ -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}-setuptools-[0-9
 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

Index: pkgsrc/finance/py-stripe/Makefile
diff -u pkgsrc/finance/py-stripe/Makefile:1.25 pkgsrc/finance/py-stripe/Makefile:1.26
--- pkgsrc/finance/py-stripe/Makefile:1.25      Tue May 12 06:51:27 2020
+++ pkgsrc/finance/py-stripe/Makefile   Sat May 16 17:42:42 2020
@@ -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 @@ LICENSE=    mit
 
 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"

Index: pkgsrc/graphics/py-Pillow/Makefile
diff -u pkgsrc/graphics/py-Pillow/Makefile:1.49 pkgsrc/graphics/py-Pillow/Makefile:1.50
--- pkgsrc/graphics/py-Pillow/Makefile:1.49     Sun Jan 26 17:31:22 2020
+++ pkgsrc/graphics/py-Pillow/Makefile  Sat May 16 17:42:42 2020
@@ -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 @@ CONFLICTS+=   ${PYPKGPREFIX}-imaging-[0-9]
 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"

Index: pkgsrc/graphics/py-blurhash/Makefile
diff -u pkgsrc/graphics/py-blurhash/Makefile:1.1 pkgsrc/graphics/py-blurhash/Makefile:1.2
--- pkgsrc/graphics/py-blurhash/Makefile:1.1    Thu Mar  5 20:36:44 2020
+++ pkgsrc/graphics/py-blurhash/Makefile        Sat May 16 17:42:42 2020
@@ -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 @@ HOMEPAGE=   https://github.com/halcy/blurh
 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"