[pkgsrc/trunk]: pkgsrc/devel pytest from versioned deps.

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95af1ba1a8ba
branches:  trunk
changeset: 431800:95af1ba1a8ba
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat May 16 16:30:15 2020 +0000

description:
pytest from versioned deps.

diffstat:

 devel/py-pyrsistent/Makefile        |  3 +--
 devel/py-radon/Makefile             |  6 ++++--
 devel/py-requests-mock/Makefile     |  5 ++---
 devel/py-requests-toolbelt/Makefile |  6 ++++--
 devel/py-requests/Makefile          |  8 +++++---
 devel/py-setuptools_scm/Makefile    |  6 ++++--
 devel/py-setuptools_trial/Makefile  |  3 +--
 devel/py-test-localserver/Makefile  |  8 +++++---
 devel/py-test-mock/Makefile         |  6 ++++--
 devel/py-test-pythonpath/Makefile   |  5 +++--
 devel/py-test-random-order/Makefile |  5 +++--
 11 files changed, 36 insertions(+), 25 deletions(-)

diffs (267 lines):

diff -r 815e023abeea -r 95af1ba1a8ba devel/py-pyrsistent/Makefile
--- a/devel/py-pyrsistent/Makefile      Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-pyrsistent/Makefile      Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/04/12 21:16:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      pyrsistent-0.16.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-radon/Makefile
--- a/devel/py-radon/Makefile   Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-radon/Makefile   Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/02/02 06:06:11 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      radon-4.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,10 +14,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-colorama>=0.4.1:../../comms/py-colorama
 DEPENDS+=      ${PYPKGPREFIX}-flake8-polyfill-[0-9]*:../../devel/py-flake8-polyfill
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -28,4 +29,5 @@
        cd ${WRKSRC}/radon/tests && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-requests-mock/Makefile
--- a/devel/py-requests-mock/Makefile   Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-requests-mock/Makefile   Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/05/13 14:37:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      requests-mock-1.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,13 +16,12 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-purl-[0-9]*:../../www/py-purl
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-testrepository>=0.0.18:../../devel/py-testrepository
 TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:test
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:test test:test
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-requests-toolbelt/Makefile
--- a/devel/py-requests-toolbelt/Makefile       Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-requests-toolbelt/Makefile       Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/02/06 11:09:21 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      requests-toolbelt-0.9.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.1.0<3.0:../../devel/py-requests
 TEST_DEPENDS+= ${PYPKGPREFIX}-betamax-[0-9]*:../../www/py-betamax
 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 -r 815e023abeea -r 95af1ba1a8ba devel/py-requests/Makefile
--- a/devel/py-requests/Makefile        Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-requests/Makefile        Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2020/04/26 09:59:51 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      requests-2.23.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,21 +17,23 @@
 DEPENDS+=      ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
 DEPENDS+=      ${PYPKGPREFIX}-urllib3>=1.12.1:../../www/py-urllib3
 TEST_DEPENDS+= ${PYPKGPREFIX}-Socks>=1.5.8:../../net/py-Socks
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.8.0:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-httpbin-[0-9]*:../../www/py-test-httpbin
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES=         # none
 REPLACE_PYTHON+=       requests/certs.py
 
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == py27
+.if ${_PYTHON_VERSION} == 27
 TEST_DEPENDS=  # none; py-test-httpbin is incompatible with py27
 do-test:
 .endif
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-setuptools_scm/Makefile
--- a/devel/py-setuptools_scm/Makefile  Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-setuptools_scm/Makefile  Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/02/14 10:12:01 adam Exp $
+# $NetBSD: Makefile,v 1.22 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      setuptools_scm-3.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,13 +12,15 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
 TEST_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} testing
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-setuptools_trial/Makefile
--- a/devel/py-setuptools_trial/Makefile        Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-setuptools_trial/Makefile        Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/04/03 20:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/16 16:35:25 adam Exp $
 
 DISTNAME=      setuptools_trial-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-test-localserver/Makefile
--- a/devel/py-test-localserver/Makefile        Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-test-localserver/Makefile        Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/11/20 21:21:23 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/16 16:30:16 adam Exp $
 
 DISTNAME=      pytest-localserver-0.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,12 +12,14 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-werkzeug>=0.10:../../www/py-werkzeug
 TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.0.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
 do-test:
-       cd ${WRKSRC}/tests && py.test-${PYVERSSUFFIX}
+       cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-test-mock/Makefile
--- a/devel/py-test-mock/Makefile       Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-test-mock/Makefile       Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/01/27 13:05:07 adam Exp $
+# $NetBSD: Makefile,v 1.22 2020/05/16 16:30:15 adam Exp $
 
 DISTNAME=      pytest-mock-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,9 +10,10 @@
 COMMENT=       Thin-wrapper around the mock package for easier use with py.test
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=2.7:../../devel/py-test
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 
+PYTHON_VERSIONED_DEPENDENCIES= test
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
@@ -22,4 +23,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-test-pythonpath/Makefile
--- a/devel/py-test-pythonpath/Makefile Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-test-pythonpath/Makefile Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/08/23 07:48:43 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 16:30:16 adam Exp $
 
 DISTNAME=      pytest-pythonpath-0.7.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,7 +10,7 @@
 COMMENT=       Pytest plugin for adding to the PYTHONPATH
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=2.5.2:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test
 
 USE_LANGUAGES= # none
 
@@ -18,4 +18,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 815e023abeea -r 95af1ba1a8ba devel/py-test-random-order/Makefile
--- a/devel/py-test-random-order/Makefile       Sat May 16 16:30:03 2020 +0000
+++ b/devel/py-test-random-order/Makefile       Sat May 16 16:30:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/29 21:43:02 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 16:30:16 adam Exp $
 
 DISTNAME=      pytest-random-order-1.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -10,9 +10,10 @@
 COMMENT=       Randomise the order in which pytest tests are run
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=3.0.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"