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

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security pytest from versioned depends
From: adam <adam%pkgsrc.org@localhost>
Date: Sun, 17 May 2020 21:37:11 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c389a0f5da7d
branches:  trunk
changeset: 431952:c389a0f5da7d
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun May 17 19:34:12 2020 +0000

description:
pytest from versioned depends

diffstat:

 security/py-OpenSSL/Makefile      |  3 +--
 security/py-acme/Makefile         |  6 ++++--
 security/py-argon2-cffi/Makefile  |  6 ++++--
 security/py-bcrypt/Makefile       |  6 ++++--
 security/py-certbot/Makefile      |  6 ++++--
 security/py-cryptography/Makefile |  6 ++++--
 security/py-josepy/Makefile       |  6 ++++--
 security/py-nacl/Makefile         |  7 +++++--
 security/py-paramiko/Makefile     |  6 ++++--
 security/py-trustme/Makefile      |  6 ++++--
 10 files changed, 38 insertions(+), 20 deletions(-)

diffs (237 lines):

diff -r d40459a89c86 -r c389a0f5da7d security/py-OpenSSL/Makefile
--- a/security/py-OpenSSL/Makefile      Sun May 17 19:22:20 2020 +0000
+++ b/security/py-OpenSSL/Makefile      Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2020/01/18 21:50:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.56 2020/05/17 19:34:12 adam Exp $
 
 DISTNAME=      pyOpenSSL-19.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -15,7 +15,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-flaky-[0-9]*:../../devel/py-flaky
 TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0.1:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 # https://github.com/pyca/pyopenssl/issues/656
diff -r d40459a89c86 -r c389a0f5da7d security/py-acme/Makefile
--- a/security/py-acme/Makefile Sun May 17 19:22:20 2020 +0000
+++ b/security/py-acme/Makefile Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/10/02 17:36:43 adam Exp $
+# $NetBSD: Makefile,v 1.21 2020/05/17 19:34:12 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -17,8 +17,10 @@
 DEPENDS+=      ${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339
 DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d40459a89c86 -r c389a0f5da7d security/py-argon2-cffi/Makefile
--- a/security/py-argon2-cffi/Makefile  Sun May 17 19:22:20 2020 +0000
+++ b/security/py-argon2-cffi/Makefile  Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/12 18:17:21 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 19:34:12 adam Exp $
 
 DISTNAME=      argon2-cffi-20.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -26,5 +27,6 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/argon2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d40459a89c86 -r c389a0f5da7d security/py-bcrypt/Makefile
--- a/security/py-bcrypt/Makefile       Sun May 17 19:22:20 2020 +0000
+++ b/security/py-bcrypt/Makefile       Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/06/20 11:15:18 adam Exp $
+# $NetBSD: Makefile,v 1.15 2020/05/17 19:34:12 adam Exp $
 
 DISTNAME=      bcrypt-3.1.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,9 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.1:../../devel/py-cffi
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.4.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d40459a89c86 -r c389a0f5da7d security/py-certbot/Makefile
--- a/security/py-certbot/Makefile      Sun May 17 19:22:20 2020 +0000
+++ b/security/py-certbot/Makefile      Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2020/05/07 10:53:44 adam Exp $
+# $NetBSD: Makefile,v 1.25 2020/05/17 19:34:12 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -23,10 +23,11 @@
 # Needed for the test target
 # https://github.com/certbot/certbot/issues/2956
 TEST_DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 BUILD_DEFS+=           VARBASE
 
 PKG_SYSCONFSUBDIR=     letsencrypt
@@ -50,4 +51,5 @@
                ${DESTDIR}${PREFIX}/share/examples/certbot-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d40459a89c86 -r c389a0f5da7d security/py-cryptography/Makefile
--- a/security/py-cryptography/Makefile Sun May 17 19:22:20 2020 +0000
+++ b/security/py-cryptography/Makefile Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2020/04/23 05:49:00 adam Exp $
+# $NetBSD: Makefile,v 1.79 2020/05/17 19:34:12 adam Exp $
 
 DISTNAME=      cryptography-2.9.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,8 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
 TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
 TEST_DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.9.3:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -32,5 +33,6 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d40459a89c86 -r c389a0f5da7d security/py-josepy/Makefile
--- a/security/py-josepy/Makefile       Sun May 17 19:22:20 2020 +0000
+++ b/security/py-josepy/Makefile       Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/02/04 16:36:53 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/17 19:34:12 adam Exp $
 
 DISTNAME=      josepy-1.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,11 +17,12 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.0:../../devel/py-coverage
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.8.0:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cache>=1.0:../../devel/py-test-cache
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8>=0.5:../../devel/py-test-flake8
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -29,4 +30,5 @@
        ${MV} jws jws-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d40459a89c86 -r c389a0f5da7d security/py-nacl/Makefile
--- a/security/py-nacl/Makefile Sun May 17 19:22:20 2020 +0000
+++ b/security/py-nacl/Makefile Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/02/19 17:49:24 tm Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/17 19:34:12 adam Exp $
 
 DISTNAME=      PyNaCl-1.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl:S/^py//}
@@ -12,7 +12,10 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.4.1:../../devel/py-cffi
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=3.27.0:../../devel/py-hypothesis
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+.include "../../lang/python/versioned_dependencies.mk"
 
 MAKE_ENV+=     SODIUM_INSTALL=system
 
diff -r d40459a89c86 -r c389a0f5da7d security/py-paramiko/Makefile
--- a/security/py-paramiko/Makefile     Sun May 17 19:22:20 2020 +0000
+++ b/security/py-paramiko/Makefile     Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2020/01/26 17:32:07 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2020/05/17 19:34:13 adam Exp $
 
 DISTNAME=      paramiko-2.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,11 +14,13 @@
 DEPENDS+=      ${PYPKGPREFIX}-cryptography>=2.5:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-nacl>=1.0.1:../../security/py-nacl
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-relaxed-[0-9]*:../../devel/py-test-relaxed
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d40459a89c86 -r c389a0f5da7d security/py-trustme/Makefile
--- a/security/py-trustme/Makefile      Sun May 17 19:22:20 2020 +0000
+++ b/security/py-trustme/Makefile      Sun May 17 19:34:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/01/22 19:20:32 adam Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/17 19:34:13 adam Exp $
 
 DISTNAME=      trustme-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-idna-[0-9]*:../../www/py-idna
 TEST_DEPENDS+= ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -24,4 +25,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/net pytest from versioned depends
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/matchbox-panel matchbox-panel: fix NetBSD aarch64 ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net pytest from versioned depends
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/matchbox-panel matchbox-panel: fix NetBSD aarch64 ...
Indexes:
Home | Main Index | Thread Index | Old Index