CVS commit: pkgsrc/www

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 17 May 2020 20:18:36 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun May 17 20:18:36 UTC 2020

Modified Files:
        pkgsrc/www/py-PasteDeploy: Makefile
        pkgsrc/www/py-WebOb: Makefile
        pkgsrc/www/py-betamax: Makefile
        pkgsrc/www/py-bleach: Makefile
        pkgsrc/www/py-flask: Makefile
        pkgsrc/www/py-flask-jwt-extended: Makefile
        pkgsrc/www/py-h2: Makefile
        pkgsrc/www/py-protego: Makefile
        pkgsrc/www/py-raven: Makefile
        pkgsrc/www/py-rfc3986: Makefile

Log Message:
pytest from versioned depends


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-PasteDeploy/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-WebOb/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/py-betamax/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/py-bleach/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/py-flask/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/py-flask-jwt-extended/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-h2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-protego/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-raven/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-rfc3986/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/py-PasteDeploy/Makefile
diff -u pkgsrc/www/py-PasteDeploy/Makefile:1.9 pkgsrc/www/py-PasteDeploy/Makefile:1.10
--- pkgsrc/www/py-PasteDeploy/Makefile:1.9      Fri Dec 14 13:29:28 2018
+++ pkgsrc/www/py-PasteDeploy/Makefile  Sun May 17 20:18:35 2020
@@ -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 @@ COMMENT=      Load, configure, and compose WS
 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
 

Index: pkgsrc/www/py-WebOb/Makefile
diff -u pkgsrc/www/py-WebOb/Makefile:1.9 pkgsrc/www/py-WebOb/Makefile:1.10
--- pkgsrc/www/py-WebOb/Makefile:1.9    Wed Jan 29 22:47:02 2020
+++ pkgsrc/www/py-WebOb/Makefile        Sun May 17 20:18:35 2020
@@ -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 @@ COMMENT=      Python module providing WSGI re
 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

Index: pkgsrc/www/py-betamax/Makefile
diff -u pkgsrc/www/py-betamax/Makefile:1.8 pkgsrc/www/py-betamax/Makefile:1.9
--- pkgsrc/www/py-betamax/Makefile:1.8  Tue Apr 17 10:45:05 2018
+++ pkgsrc/www/py-betamax/Makefile      Sun May 17 20:18:35 2020
@@ -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"

Index: pkgsrc/www/py-bleach/Makefile
diff -u pkgsrc/www/py-bleach/Makefile:1.16 pkgsrc/www/py-bleach/Makefile:1.17
--- pkgsrc/www/py-bleach/Makefile:1.16  Thu Apr 30 09:37:26 2020
+++ pkgsrc/www/py-bleach/Makefile       Sun May 17 20:18:35 2020
@@ -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 @@ LICENSE=      apache-2.0
 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
 

Index: pkgsrc/www/py-flask/Makefile
diff -u pkgsrc/www/py-flask/Makefile:1.16 pkgsrc/www/py-flask/Makefile:1.17
--- pkgsrc/www/py-flask/Makefile:1.16   Tue Apr  7 08:52:06 2020
+++ pkgsrc/www/py-flask/Makefile        Sun May 17 20:18:35 2020
@@ -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}-click>=5.1:../.
 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 @@ do-test:
        cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-flask-jwt-extended/Makefile
diff -u pkgsrc/www/py-flask-jwt-extended/Makefile:1.8 pkgsrc/www/py-flask-jwt-extended/Makefile:1.9
--- pkgsrc/www/py-flask-jwt-extended/Makefile:1.8       Fri Oct 25 09:34:08 2019
+++ pkgsrc/www/py-flask-jwt-extended/Makefile   Sun May 17 20:18:35 2020
@@ -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}-flask>=1.0:../.
 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 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-h2/Makefile
diff -u pkgsrc/www/py-h2/Makefile:1.7 pkgsrc/www/py-h2/Makefile:1.8
--- pkgsrc/www/py-h2/Makefile:1.7       Mon Feb 17 12:12:37 2020
+++ pkgsrc/www/py-h2/Makefile   Sun May 17 20:18:36 2020
@@ -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 @@ LICENSE=    mit
 
 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"

Index: pkgsrc/www/py-protego/Makefile
diff -u pkgsrc/www/py-protego/Makefile:1.1 pkgsrc/www/py-protego/Makefile:1.2
--- pkgsrc/www/py-protego/Makefile:1.1  Wed Jan 29 21:52:27 2020
+++ pkgsrc/www/py-protego/Makefile      Sun May 17 20:18:36 2020
@@ -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 @@ COMMENT=      Pure-Python robots.txt parser w
 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
 

Index: pkgsrc/www/py-raven/Makefile
diff -u pkgsrc/www/py-raven/Makefile:1.9 pkgsrc/www/py-raven/Makefile:1.10
--- pkgsrc/www/py-raven/Makefile:1.9    Sun Mar 22 12:28:28 2020
+++ pkgsrc/www/py-raven/Makefile        Sun May 17 20:18:36 2020
@@ -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 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-pytz-[0-9]
 # 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}-unittest2-
 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 @@ post-install:
        ${MV} raven raven-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-rfc3986/Makefile
diff -u pkgsrc/www/py-rfc3986/Makefile:1.2 pkgsrc/www/py-rfc3986/Makefile:1.3
--- pkgsrc/www/py-rfc3986/Makefile:1.2  Sat Apr 11 07:11:35 2020
+++ pkgsrc/www/py-rfc3986/Makefile      Sun May 17 20:18:36 2020
@@ -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 @@ COMMENT=      Validating URI References per R
 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 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: CVS commit: pkgsrc/lang/gcc49
Next by Date: CVS commit: pkgsrc/www/py-nbformat
Previous by Thread: CVS commit: pkgsrc/lang/gcc49
Next by Thread: CVS commit: pkgsrc/www/py-nbformat
Indexes:

Home | Main Index | Thread Index | Old Index