pytest from versioned deps.

9 files changed, 36 insertions, 19 deletions

diff --git a/devel/py-test-relaxed/Makefile b/devel/py-test-relaxed/Makefile
index 6dc7d9834b8..081134eb97d 100644
--- a/devel/py-test-relaxed/Makefile
+++ b/devel/py-test-relaxed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/06/17 21:06:29 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 17:38:39 adam Exp $
 
 DISTNAME=	pytest-relaxed-1.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,11 +12,13 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-decorator>=4.0.0:../../devel/py-decorator
 DEPENDS+=	${PYPKGPREFIX}-six>=1.0.0:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-test>=3.0.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test
 
 USE_LANGUAGES=	# none
 
 PYSETUPTESTTARGET=	pytest
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-test-timeout/Makefile b/devel/py-test-timeout/Makefile
index 2357c50659e..48326f24873 100644
--- a/devel/py-test-timeout/Makefile
+++ b/devel/py-test-timeout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/01/07 08:48:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	pytest-timeout-1.3.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/pytest-dev/pytest-timeout
 COMMENT=	Py.test plugin to abort hanging tests
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-test>=3.6.0:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES=	test
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-test-virtualenv/Makefile b/devel/py-test-virtualenv/Makefile
index 0d11d7f3ee9..a1f1f18a75f 100644
--- a/devel/py-test-virtualenv/Makefile
+++ b/devel/py-test-virtualenv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/10/29 15:08:31 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	pytest-virtualenv-1.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,13 +10,15 @@ HOMEPAGE=	https://github.com/manahl/pytest-plugins
 COMMENT=	Virtualenv fixture for py.test
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 DEPENDS+=	${PYPKGPREFIX}-test-fixture-config-[0-9]*:../../devel/py-test-fixture-config
 DEPENDS+=	${PYPKGPREFIX}-test-shutil-[0-9]*:../../devel/py-test-shutil
 DEPENDS+=	${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
+PYTHON_VERSIONED_DEPENDENCIES=	test
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-test-watch/Makefile b/devel/py-test-watch/Makefile
index bca637b9f73..f84da8c42b9 100644
--- a/devel/py-test-watch/Makefile
+++ b/devel/py-test-watch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/18 13:00:44 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	pytest-watch-4.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,9 +12,10 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-colorama>=0.3.3:../../comms/py-colorama
 DEPENDS+=	${PYPKGPREFIX}-docopt>=0.4.0:../../devel/py-docopt
-DEPENDS+=	${PYPKGPREFIX}-test>=2.6.4:../../devel/py-test
 DEPENDS+=	${PYPKGPREFIX}-watchdog>=0.6.0:../../sysutils/py-watchdog
 
+PYTHON_VERSIONED_DEPENDENCIES=	test
+
 USE_LANGUAGES=	# none
 
 post-install:
@@ -23,4 +24,5 @@ post-install:
 	${MV} pytest-watch pytest-watch-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-test-xprocess/Makefile b/devel/py-test-xprocess/Makefile
index 7d16a4d13c1..9866b21d0f8 100644
--- a/devel/py-test-xprocess/Makefile
+++ b/devel/py-test-xprocess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/03/23 09:48:37 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	pytest-xprocess-0.13.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,9 +12,11 @@ LICENSE=	mit
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 DEPENDS+=	${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
-DEPENDS+=	${PYPKGPREFIX}-test>=2.8:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES=	test
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-testresources/Makefile b/devel/py-testresources/Makefile
index 20a30a64c87..afe3675c2fc 100644
--- a/devel/py-testresources/Makefile
+++ b/devel/py-testresources/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/04/11 07:29:00 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	testresources-2.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,12 @@ LICENSE=	apache-2.0 OR modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 DEPENDS+=	${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
 DEPENDS+=	${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
-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-tox/Makefile b/devel/py-tox/Makefile
index afc6f402b2a..c7f9ccc1ecc 100644
--- a/devel/py-tox/Makefile
+++ b/devel/py-tox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/05/29 19:56:50 adam Exp $
+# $NetBSD: Makefile,v 1.19 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	tox-3.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,13 +21,14 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_s
 TEST_DEPENDS+=	${PYPKGPREFIX}-freezegun>=0.3.11:../../devel/py-freezegun
 TEST_DEPENDS+=	${PYPKGPREFIX}-flaky>=3.4.0:../../devel/py-flaky
 TEST_DEPENDS+=	${PYPKGPREFIX}-pathlib2>=2.3.3:../../devel/py-pathlib2
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.0.0:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-mock>=1.10.0:../../devel/py-test-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-randomly>=1.2.3:../../devel/py-test-randomly
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-timeout>=1.3.0:../../devel/py-test-timeout
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist>=1.22.2:../../devel/py-test-xdist
 
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
+
 USE_LANGUAGES=	# none
 
 post-install:
@@ -39,4 +40,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/devel/py-vine/Makefile b/devel/py-vine/Makefile
index 6de1b45d251..d904406f871 100644
--- a/devel/py-vine/Makefile
+++ b/devel/py-vine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/07/09 11:35:14 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	vine-1.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,11 @@ COMMENT=	Promises, promises, promises
 LICENSE=	modified-bsd
 
 TEST_DEPENDS+=	${PYPKGPREFIX}-case>=1.3.1:../../devel/py-case
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.0:../../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/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 33e4afeec4c..bbb3bb4184a 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2020/01/22 19:27:06 adam Exp $
+# $NetBSD: Makefile,v 1.51 2020/05/16 17:38:40 adam Exp $
 
 DISTNAME=	virtualenv-16.7.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	mit
 TEST_DEPENDS+=	${PYPKGPREFIX}-coverage>=4.5.0:../../devel/py-coverage
 TEST_DEPENDS+=	${PYPKGPREFIX}-pypiserver-[0-9]*:../../net/py-pypiserver
 TEST_DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=4.0.0:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-timeout>=1.3.0:../../devel/py-test-timeout
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
@@ -22,6 +21,8 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
+
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON=	virtualenv.py
@@ -35,4 +36,5 @@ do-test:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"