pytest from versioned depends

14 files changed, 49 insertions, 31 deletions

diff --git a/textproc/py-ICU/Makefile b/textproc/py-ICU/Makefile
index 3a009a4b400..bfd984c8890 100644
--- a/textproc/py-ICU/Makefile
+++ b/textproc/py-ICU/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/04/17 16:58:32 gutteridge Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/17 21:38:45 adam Exp $
 
 DISTNAME=	PyICU-2.4.3
 PKGREVISION=	3
@@ -15,8 +15,10 @@ USE_LANGUAGES=	c c++11
 USE_TOOLS+=	pkg-config
 
 TEST_DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 .include "../../lang/python/egg.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-JWT/Makefile b/textproc/py-JWT/Makefile
index 4cc7aa1ef73..84155bc1225 100644
--- a/textproc/py-JWT/Makefile
+++ b/textproc/py-JWT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/12/10 09:02:58 adam Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/17 21:38:45 adam Exp $
 
 DISTNAME=	PyJWT-1.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//}
@@ -11,13 +11,12 @@ COMMENT=	JSON Web Token implementation in Python
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.4:../../security/py-cryptography
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.7.1:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner>=4.2:../../devel/py-test-runner
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
-		${MV} pyjwt jwt-${PYVERSSUFFIX} || ${TRUE}
+	${MV} pyjwt jwt-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-Whoosh/Makefile b/textproc/py-Whoosh/Makefile
index 9295dbec2ff..5008607750e 100644
--- a/textproc/py-Whoosh/Makefile
+++ b/textproc/py-Whoosh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/10/07 11:07:39 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	Whoosh-2.7.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,10 @@ HOMEPAGE=	https://bitbucket.org/mchaput/whoosh/wiki/Home
 COMMENT=	Fast, featureful full-text indexing and searching library implemented
 LICENSE=	apache-2.0
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
-USE_LANGUAGES=		# none
+USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-docx/Makefile b/textproc/py-docx/Makefile
index b7d75ffc26c..ee31f3e065d 100644
--- a/textproc/py-docx/Makefile
+++ b/textproc/py-docx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/01/09 08:38:40 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	python-docx-0.8.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -14,7 +14,8 @@ DEPENDS+=	${PYPKGPREFIX}-lxml>=2.3.2:../../textproc/py-lxml
 TEST_DEPENDS+=	${PYPKGPREFIX}-behave-[0-9]*:../../devel/py-behave
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 USE_LANGUAGES=	# none
 
@@ -22,4 +23,5 @@ do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-jsbeautifier/Makefile b/textproc/py-jsbeautifier/Makefile
index af1a9e7091b..3d7f8a85549 100644
--- a/textproc/py-jsbeautifier/Makefile
+++ b/textproc/py-jsbeautifier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/04/11 16:28:58 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	jsbeautifier-1.11.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-editorconfig-core>=0.12.2:../../devel/py-editorconfig-core
 DEPENDS+=	${PYPKGPREFIX}-six>=1.13.0:../../lang/py-six
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 USE_LANGUAGES=	# none
 
@@ -21,4 +22,5 @@ post-install:
 	${MV} js-beautify js-beautify-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-jsonref/Makefile b/textproc/py-jsonref/Makefile
index d357f9dc2e4..46476492b2d 100644
--- a/textproc/py-jsonref/Makefile
+++ b/textproc/py-jsonref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/11/20 11:52:43 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	jsonref-0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,11 @@ HOMEPAGE=	https://github.com/gazpachoking/jsonref
 COMMENT=	JSON References for Python
 LICENSE=	mit
 
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 do-test:
-	cd ${WRKSRC} && py.test-${PYVERSSUFFIX} tests.py
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-poyo/Makefile b/textproc/py-poyo/Makefile
index 3e62bee6ead..4d6fc523848 100644
--- a/textproc/py-poyo/Makefile
+++ b/textproc/py-poyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/01/14 21:35:45 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	poyo-0.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/hackebrot/poyo
 COMMENT=	YAML Parser for Python
 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/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 3307928c0dd..3979c8433c5 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/03/09 18:34:23 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	Pygments-2.5.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,10 +10,11 @@ HOMEPAGE=	https://pygments.org/
 COMMENT=	Python syntax highlighter
 LICENSE=	2-clause-bsd
 
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 # circular dependency
 #TEST_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
+
 USE_LANGUAGES=	# none
 
 post-install:
@@ -24,4 +25,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/textproc/py-readme_renderer/Makefile b/textproc/py-readme_renderer/Makefile
index a4a8c3463ff..e875638cf1e 100644
--- a/textproc/py-readme_renderer/Makefile
+++ b/textproc/py-readme_renderer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/04/23 05:53:00 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	readme_renderer-26.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,8 @@ DEPENDS+=	${PYPKGPREFIX}-bleach>=2.1.0:../../www/py-bleach
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.13.1:../../textproc/py-docutils
 DEPENDS+=	${PYPKGPREFIX}-pygments>=2.5.1:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 USE_LANGUAGES=	# none
 
@@ -22,4 +23,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/textproc/py-sphinx1/Makefile b/textproc/py-sphinx1/Makefile
index 0334a3eb1e5..6045b22b5e5 100644
--- a/textproc/py-sphinx1/Makefile
+++ b/textproc/py-sphinx1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/10/21 21:04:05 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	Sphinx-1.8.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -31,9 +31,10 @@ DEPENDS+=	${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 
 TEST_DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 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
 USE_TOOLS+=		makeinfo
 
@@ -48,4 +49,5 @@ post-install:
 	${MV} sphinx-quickstart sphinx-quickstart-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-sphinxcontrib-websupport/Makefile b/textproc/py-sphinxcontrib-websupport/Makefile
index 5dd2cc0ee3f..0b7f8e1f3f6 100644
--- a/textproc/py-sphinxcontrib-websupport/Makefile
+++ b/textproc/py-sphinxcontrib-websupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/12/11 10:34:50 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=	sphinxcontrib-websupport-1.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,11 @@ COMMENT=	Sphinx API for Web Apps
 LICENSE=	2-clause-bsd
 
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-textile/Makefile b/textproc/py-textile/Makefile
index e7f5c42a2cc..84a419ccb11 100644
--- a/textproc/py-textile/Makefile
+++ b/textproc/py-textile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/15 17:28:16 adam Exp $
+# $NetBSD: Makefile,v 1.20 2020/05/17 21:38:47 adam Exp $
 
 DISTNAME=	textile-3.0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-html5lib>=0.999999999:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
 USE_LANGUAGES=	# none
diff --git a/textproc/py-toml/Makefile b/textproc/py-toml/Makefile
index e2c93ccfa10..1a9c5ec2ded 100644
--- a/textproc/py-toml/Makefile
+++ b/textproc/py-toml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/14 05:37:14 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:47 adam Exp $
 
 DISTNAME=	toml-0.10.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/uiri/toml
 COMMENT=	Python Library for Tom's Obvious, Minimal Language
 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/textproc/py-validators/Makefile b/textproc/py-validators/Makefile
index 303c344ce04..57af9861abf 100644
--- a/textproc/py-validators/Makefile
+++ b/textproc/py-validators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/12/05 09:42:43 adam Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/17 21:38:47 adam Exp $
 
 DISTNAME=	validators-0.14.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,8 @@ DEPENDS+=	${PYPKGPREFIX}-decorator>=3.4.0:../../devel/py-decorator
 DEPENDS+=	${PYPKGPREFIX}-six>=1.4.0:../../lang/py-six
 TEST_DEPENDS+=	${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
 TEST_DEPENDS+=	${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=2.2.3:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 
 USE_LANGUAGES=	# none
 
@@ -22,4 +23,5 @@ do-test:
 	cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"