pytest from versioned deps.

9 files changed, 37 insertions, 32 deletions

diff --git a/devel/py-dotenv/Makefile b/devel/py-dotenv/Makefile
index a93d0f24507..16d0893fea9 100644
--- a/devel/py-dotenv/Makefile
+++ b/devel/py-dotenv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/04 15:37:01 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=	python-dotenv-0.13.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^python-//}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-click>=5.0:../../devel/py-click
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-sh-[0-9]*:../../sysutils/py-sh
-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"
diff --git a/devel/py-entrypoints/Makefile b/devel/py-entrypoints/Makefile
index 96b5c42d2bb..bdfe92bc70d 100644
--- a/devel/py-entrypoints/Makefile
+++ b/devel/py-entrypoints/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/22 10:48:14 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=	entrypoints-0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/takluyver/entrypoints
 COMMENT=	Discover and load entry points from installed packages
 LICENSE=	mit
 
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -23,4 +23,5 @@ do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-extras/Makefile b/devel/py-extras/Makefile
index 29bb8f53221..b60fe61bd41 100644
--- a/devel/py-extras/Makefile
+++ b/devel/py-extras/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2019/11/03 10:18:27 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=	extras-1.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel
+CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=e/extras/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,15 +10,16 @@ HOMEPAGE=	https://github.com/testing-cabal/extras
 COMMENT=	Useful extra bits for Python
 LICENSE=	mit
 
-USE_LANGUAGES=	# none
-
-# TEST_DEPENDS
-BUILD_DEPENDS+=		${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 # testtools depends on extras
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
+
+USE_LANGUAGES=	# none
+
 do-test:
-	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-flake8-import-order/Makefile b/devel/py-flake8-import-order/Makefile
index 6eb8cf9c801..b4f95b6e670 100644
--- a/devel/py-flake8-import-order/Makefile
+++ b/devel/py-flake8-import-order/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/03/05 12:48:17 adam Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=	flake8-import-order-0.18.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,10 +14,12 @@ DEPENDS+=	${PYPKGPREFIX}-asttokens-[0-9]*:../../lang/py-asttokens
 DEPENDS+=	${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
 TEST_DEPENDS+=	${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
 TEST_DEPENDS+=	${PYPKGPREFIX}-lama-[0-9]*:../../devel/py-lama
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 do-test:
-	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-flake8-polyfill/Makefile b/devel/py-flake8-polyfill/Makefile
index 8666d4e83ba..9a8347221da 100644
--- a/devel/py-flake8-polyfill/Makefile
+++ b/devel/py-flake8-polyfill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/01/01 21:26:15 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 17:13:41 adam Exp $
 
 DISTNAME=	flake8-polyfill-1.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,15 +11,16 @@ COMMENT=	Polyfill package for Flake8 plugins
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
-# TEST_DEPENDS
-BUILD_DEPENDS+=	${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 USE_LANGUAGES=	# none
 
 # needs to be installed
 do-test:
-	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-func_timeout/Makefile b/devel/py-func_timeout/Makefile
index c8a0231f5df..ddf39d35f19 100644
--- a/devel/py-func_timeout/Makefile
+++ b/devel/py-func_timeout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/12 07:32:28 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 17:13:41 adam Exp $
 
 DISTNAME=	func_timeout-4.3.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/kata198/func_timeout
 COMMENT=	Specify timeouts when calling any existing function
 LICENSE=	gnu-lgpl-v2
 
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 USE_LANGUAGES=	# none
 
@@ -20,4 +20,5 @@ do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-fuzzywuzzy/Makefile b/devel/py-fuzzywuzzy/Makefile
index ca75353a749..bf1db86da05 100644
--- a/devel/py-fuzzywuzzy/Makefile
+++ b/devel/py-fuzzywuzzy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/04/06 08:00:19 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=	fuzzywuzzy-0.18.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,14 +13,11 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${PYPKGPREFIX}-Levenshtein-[0-9]*:../../textproc/py-Levenshtein
 TEST_DEPENDS+=	${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
 TEST_DEPENDS+=	${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
-USE_LANGUAGES=	# none
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
-#post-install:
-#	cd ${DESTDIR}${PREFIX}/bin && \
-#	${MV} futurize futurize-${PYVERSSUFFIX} && \
-#	${MV} pasteurize pasteurize-${PYVERSSUFFIX} || ${TRUE}
+USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-iso3166/Makefile b/devel/py-iso3166/Makefile
index 0e20389f68a..afaf4b3e312 100644
--- a/devel/py-iso3166/Makefile
+++ b/devel/py-iso3166/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/01/16 10:08:31 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=	iso3166-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/deactivated/python-iso3166
 COMMENT=	Self-contained ISO 3166-1 country definitions
 LICENSE=	mit
 
-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} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-isort/Makefile b/devel/py-isort/Makefile
index a299e5d0c68..fbc2db3ca23 100644
--- a/devel/py-isort/Makefile
+++ b/devel/py-isort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/07/01 07:15:00 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=	isort-4.3.21
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,8 @@ COMMENT=	Python utility / library to sort imports
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-lama-[0-9]*:../../devel/py-lama
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -29,4 +30,5 @@ do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_isort.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"