[pkgsrc/trunk]: pkgsrc/www pytest from versioned depends

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www pytest from versioned depends
From: adam <adam%pkgsrc.org@localhost>
Date: Sun, 17 May 2020 21:37:15 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/97d3f9992b1d
branches:  trunk
changeset: 431961:97d3f9992b1d
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun May 17 20:18:35 2020 +0000

description:
pytest from versioned depends

diffstat:

 www/py-PasteDeploy/Makefile        |   3 +--
 www/py-WebOb/Makefile              |   4 ++--
 www/py-betamax/Makefile            |  12 +++++++-----
 www/py-bleach/Makefile             |   3 +--
 www/py-flask-jwt-extended/Makefile |   6 ++++--
 www/py-flask/Makefile              |   6 ++++--
 www/py-h2/Makefile                 |   6 ++++--
 www/py-protego/Makefile            |   4 ++--
 www/py-raven/Makefile              |   6 ++++--
 www/py-rfc3986/Makefile            |   6 ++++--
 10 files changed, 33 insertions(+), 23 deletions(-)

diffs (237 lines):

diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-PasteDeploy/Makefile
--- a/www/py-PasteDeploy/Makefile       Sun May 17 20:08:38 2020 +0000
+++ b/www/py-PasteDeploy/Makefile       Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/12/14 13:29:28 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/17 20:18:35 adam Exp $
 
 DISTNAME=      PasteDeploy-2.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@
 LICENSE=       mit
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 USE_LANGUAGES= # none
 
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-WebOb/Makefile
--- a/www/py-WebOb/Makefile     Sun May 17 20:08:38 2020 +0000
+++ b/www/py-WebOb/Makefile     Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/01/29 22:47:02 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/17 20:18:35 adam Exp $
 
 DISTNAME=      WebOb-1.8.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,8 +11,8 @@
 LICENSE=       mit
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.1.0:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 
 USE_LANGUAGES= # none
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-betamax/Makefile
--- a/www/py-betamax/Makefile   Sun May 17 20:08:38 2020 +0000
+++ b/www/py-betamax/Makefile   Sun May 17 20:18:35 2020 +0000
@@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.8 2018/04/17 10:45:05 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/17 20:18:35 adam Exp $
 
 DISTNAME=      betamax-0.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    www
+CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/betamax/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://pypi.python.org/pypi/betamax
+HOMEPAGE=      https://github.com/sigmavirus24/betamax
 COMMENT=       VCR imitation for python-requests
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+DEPENDS+=      ${PYPKGPREFIX}-requests>=2.0:../../devel/py-requests
+
+PYTHON_VERSIONED_DEPENDENCIES= test:build
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-bleach/Makefile
--- a/www/py-bleach/Makefile    Sun May 17 20:08:38 2020 +0000
+++ b/www/py-bleach/Makefile    Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/04/30 09:37:26 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/05/17 20:18:35 adam Exp $
 
 DISTNAME=      bleach-3.1.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.9:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-webencodings-[0-9]*:../../textproc/py-webencodings
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner>=2.0:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0.0:../../devel/py-test
 
 USE_LANGUAGES= # none
 
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-flask-jwt-extended/Makefile
--- a/www/py-flask-jwt-extended/Makefile        Sun May 17 20:08:38 2020 +0000
+++ b/www/py-flask-jwt-extended/Makefile        Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/25 09:34:08 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/17 20:18:35 adam Exp $
 
 DISTNAME=      Flask-JWT-Extended-3.24.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,7 +15,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-cryptography>=2.3:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-werkzeug>=0.14:../../www/py-werkzeug
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -23,4 +24,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-flask/Makefile
--- a/www/py-flask/Makefile     Sun May 17 20:08:38 2020 +0000
+++ b/www/py-flask/Makefile     Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/04/07 08:52:06 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/05/17 20:18:35 adam Exp $
 
 DISTNAME=      Flask-1.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,7 +14,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-itsdangerous>=0.24:../../security/py-itsdangerous
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.10.1:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-werkzeug>=0.15:../../www/py-werkzeug
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -26,4 +27,5 @@
        cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-h2/Makefile
--- a/www/py-h2/Makefile        Sun May 17 20:08:38 2020 +0000
+++ b/www/py-h2/Makefile        Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/02/17 12:12:37 adam Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/17 20:18:36 adam Exp $
 
 DISTNAME=      h2-3.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,16 +12,18 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-hyperframe>=5.2.0:../../www/py-hyperframe
 DEPENDS+=      ${PYPKGPREFIX}-hpack>=3.0:../../net/py-hpack
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-enum34>=1.1.6:../../devel/py-enum34
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-protego/Makefile
--- a/www/py-protego/Makefile   Sun May 17 20:08:38 2020 +0000
+++ b/www/py-protego/Makefile   Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/29 21:52:27 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/17 20:18:36 adam Exp $
 
 DISTNAME=      Protego-0.1.16
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,7 +11,7 @@
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 USE_LANGUAGES= # none
 
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-raven/Makefile
--- a/www/py-raven/Makefile     Sun May 17 20:08:38 2020 +0000
+++ b/www/py-raven/Makefile     Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/03/22 12:28:28 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/17 20:18:36 adam Exp $
 
 DISTNAME=      raven-6.10.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -29,7 +29,6 @@
 # avoid circular dependency
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 TEST_DEPENDS+= ${PYPKGPREFIX}-sanic>=0.7.0:../../www/py-sanic
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.2.0:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8>=1.0.0:../../devel/py-test-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-pythonpath>=0.7.1:../../devel/py-test-pythonpath
@@ -42,6 +41,8 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 TEST_DEPENDS+= ${PYPKGPREFIX}-zconfig-[0-9]*:../../devel/py-zconfig
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 .include "../../lang/python/pyversion.mk"
 .if ${PYPKGPREFIX} == py27
 DEPENDS+=      ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
@@ -56,4 +57,5 @@
        ${MV} raven raven-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e7a1b6d7bd28 -r 97d3f9992b1d www/py-rfc3986/Makefile
--- a/www/py-rfc3986/Makefile   Sun May 17 20:08:38 2020 +0000
+++ b/www/py-rfc3986/Makefile   Sun May 17 20:18:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/04/11 07:11:35 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 20:18:36 adam Exp $
 
 DISTNAME=      rfc3986-1.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,8 @@
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-idna-[0-9]*:../../www/py-idna
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -19,4 +20,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/gcc48 lang/gcc48: build even with -Werror=char-su...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/py-nbformat py-nbformat: updated to 5.0.6
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/gcc48 lang/gcc48: build even with -Werror=char-su...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/py-nbformat py-nbformat: updated to 5.0.6
Indexes:
Home | Main Index | Thread Index | Old Index