Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc pytest from versioned depends

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f12f0aec2dd
branches:  trunk
changeset: 431834:0f12f0aec2dd
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat May 16 18:00:31 2020 +0000

description:
pytest from versioned depends

diffstat:

 net/py-kombu/Makefile       |  6 ++++--
 net/py-lexicon/Makefile     |  6 ++++--
 net/py-paho-mqtt/Makefile   |  3 +--
 net/py-portend/Makefile     |  6 ++++--
 net/py-pypiserver/Makefile  |  6 ++++--
 net/py-responses/Makefile   |  6 ++++--
 net/py-tldextract/Makefile  |  6 ++++--
 net/py-twine/Makefile       |  6 ++++--
 net/py-zmq/Makefile         |  6 ++++--
 www/py-test-django/Makefile |  6 ++++--
 www/py-urllib3/Makefile     |  4 ++--
 11 files changed, 39 insertions(+), 22 deletions(-)

diffs (276 lines):

diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-kombu/Makefile
--- a/net/py-kombu/Makefile     Sat May 16 17:59:10 2020 +0000
+++ b/net/py-kombu/Makefile     Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/04/12 11:01:36 adam Exp $
+# $NetBSD: Makefile,v 1.28 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      kombu-4.6.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,13 +15,14 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-Pyro4-[0-9]*:../../devel/py-Pyro
 TEST_DEPENDS+= ${PYPKGPREFIX}-case>=1.5.2:../../devel/py-case
 TEST_DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.18:../../devel/py-importlib-metadata
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 REPLACE_PYTHON+=       kombu/tests/test_serialization.py
@@ -29,4 +30,5 @@
 .include "options.mk"
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-lexicon/Makefile
--- a/net/py-lexicon/Makefile   Sat May 16 17:59:10 2020 +0000
+++ b/net/py-lexicon/Makefile   Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2020/05/07 10:51:42 adam Exp $
+# $NetBSD: Makefile,v 1.46 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      dns-lexicon-3.3.22
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/dns-//}
@@ -16,9 +16,10 @@
 DEPENDS+=      ${PYPKGPREFIX}-tldextract-[0-9]*:../../net/py-tldextract
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=2.0.0:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=4.1.1:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.26.1:../../devel/py-test-xdist
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 MESSAGE_SUBST+=        PYPKGPREFIX=${PYPKGPREFIX}
 
 post-install:
@@ -30,4 +31,5 @@
        cd ${WRKSRC}/lexicon && pytest-${PYVERSSUFFIX} tests/test_*
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-paho-mqtt/Makefile
--- a/net/py-paho-mqtt/Makefile Sat May 16 17:59:10 2020 +0000
+++ b/net/py-paho-mqtt/Makefile Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/03/12 16:10:14 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      paho-mqtt-1.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,6 @@
 # tests are not included
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-lama>=7.6.6:../../devel/py-lama
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-#TEST_DEPENDS+=        ${PYPKGPREFIX}-test>=2.8.0:../../devel/py-test
 
 USE_LANGUAGES= # none
 
diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-portend/Makefile
--- a/net/py-portend/Makefile   Sat May 16 17:59:10 2020 +0000
+++ b/net/py-portend/Makefile   Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/13 21:37:28 adam Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      portend-2.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,14 +12,16 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-tempora>=1.8:../../time/py-tempora
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.8:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar
 # missing: pytest-black-multipy
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_portend.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-pypiserver/Makefile
--- a/net/py-pypiserver/Makefile        Sat May 16 17:59:10 2020 +0000
+++ b/net/py-pypiserver/Makefile        Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/16 08:20:01 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      pypiserver-1.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-watchdog-[0-9]*:../../sysutils/py-watchdog
 TEST_DEPENDS+= ${PYPKGPREFIX}-WebTest-[0-9]*:../../www/py-WebTest
 TEST_DEPENDS+= ${PYPKGPREFIX}-pip>=7:../../devel/py-pip
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.3:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 TEST_DEPENDS+= ${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine
 .include "../../lang/python/pyversion.mk"
@@ -24,6 +23,8 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -31,4 +32,5 @@
        ${MV} pypi-server pypi-server-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-responses/Makefile
--- a/net/py-responses/Makefile Sat May 16 17:59:10 2020 +0000
+++ b/net/py-responses/Makefile Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/04/22 20:21:15 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      responses-0.10.14
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -21,11 +21,13 @@
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=3.7.1:../../devel/py-coverage
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
 
+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 98bd1350cb66 -r 0f12f0aec2dd net/py-tldextract/Makefile
--- a/net/py-tldextract/Makefile        Sat May 16 17:59:10 2020 +0000
+++ b/net/py-tldextract/Makefile        Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/11/14 18:04:00 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      tldextract-2.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,9 +15,10 @@
 DEPENDS+=      ${PYPKGPREFIX}-requests-file>=1.4:../../devel/py-requests-file
 DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TEST_DEPENDS+= ${PYPKGPREFIX}-responses-[0-9]*:../../net/py-responses
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-pylint-[0-9]*:../../devel/py-test-pylint
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -28,4 +29,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-twine/Makefile
--- a/net/py-twine/Makefile     Sat May 16 17:59:10 2020 +0000
+++ b/net/py-twine/Makefile     Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/03/13 18:02:31 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 18:00:31 adam Exp $
 
 DISTNAME=      twine-1.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-requests-toolbelt>=0.9.1:../../devel/py-requests-toolbelt
 DEPENDS+=      ${PYPKGPREFIX}-setuptools>=0.7.0:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-tqdm>=4.14:../../misc/py-tqdm
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -28,4 +29,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd net/py-zmq/Makefile
--- a/net/py-zmq/Makefile       Sat May 16 17:59:10 2020 +0000
+++ b/net/py-zmq/Makefile       Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/05/12 08:19:46 adam Exp $
+# $NetBSD: Makefile,v 1.30 2020/05/16 18:00:32 adam Exp $
 
 DISTNAME=      pyzmq-19.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -11,12 +11,14 @@
 LICENSE=       gnu-lgpl-v3 AND modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_TOOLS+=    pkg-config
 
 PYSETUPBUILDARGS+=     --zmq=${BUILDLINK_PREFIX.zeromq:Q}
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../net/zeromq/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd www/py-test-django/Makefile
--- a/www/py-test-django/Makefile       Sat May 16 17:59:10 2020 +0000
+++ b/www/py-test-django/Makefile       Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/04/06 16:55:46 adam Exp $
+# $NetBSD: Makefile,v 1.19 2020/05/16 18:02:59 adam Exp $
 
 DISTNAME=      pytest-django-3.9.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -10,10 +10,12 @@
 COMMENT=       Django plugin for pytest
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=3.6:../../devel/py-test
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.11.1:../../devel/py-setuptools_scm
 
+PYTHON_VERSIONED_DEPENDENCIES= test
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98bd1350cb66 -r 0f12f0aec2dd www/py-urllib3/Makefile
--- a/www/py-urllib3/Makefile   Sat May 16 17:59:10 2020 +0000
+++ b/www/py-urllib3/Makefile   Sat May 16 18:00:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/04/16 18:30:05 adam Exp $
+# $NetBSD: Makefile,v 1.22 2020/05/16 18:02:59 adam Exp $
 
 DISTNAME=      urllib3-1.25.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@
 .endif
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 TEST_DEPENDS+= ${PYPKGPREFIX}-trustme-[0-9]*:../../security/py-trustme
Home | Main Index | Thread Index | Old Index