CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 6 Oct 2020 10:51:22 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct  6 10:51:22 UTC 2020

Modified Files:
        pkgsrc/archivers/py-zstandard: Makefile
        pkgsrc/audio/py-mutagen: Makefile
        pkgsrc/converters/py-chardet: Makefile
        pkgsrc/devel/py-attrs: Makefile
        pkgsrc/devel/py-fuzzywuzzy: Makefile
        pkgsrc/devel/py-pyrsistent: Makefile
        pkgsrc/devel/py-test4: Makefile
        pkgsrc/net/py-subunit: Makefile
        pkgsrc/security/py-argon2-cffi: Makefile
        pkgsrc/security/py-cryptography: Makefile
        pkgsrc/security/py-nacl: Makefile
        pkgsrc/sysutils/py-eliot17: Makefile
        pkgsrc/time/py-dateutil: Makefile

Log Message:
*: use py-hypothesis via versioned_dependencies.mk


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/archivers/py-zstandard/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/py-mutagen/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/converters/py-chardet/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-attrs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-fuzzywuzzy/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-pyrsistent/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-test4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-subunit/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-argon2-cffi/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/security/py-cryptography/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/py-nacl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/py-eliot17/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/time/py-dateutil/Makefile

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

Modified files:

Index: pkgsrc/archivers/py-zstandard/Makefile
diff -u pkgsrc/archivers/py-zstandard/Makefile:1.15 pkgsrc/archivers/py-zstandard/Makefile:1.16
--- pkgsrc/archivers/py-zstandard/Makefile:1.15 Sun Jun 14 13:53:06 2020
+++ pkgsrc/archivers/py-zstandard/Makefile      Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/06/14 13:53:06 adam Exp $
+# $NetBSD: Makefile,v 1.16 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      zstandard-0.14.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,11 +11,13 @@ COMMENT=    Zstandard bindings for Python
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.11:../../devel/py-cffi
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
+
+PYTHON_VERSIONED_DEPENDENCIES= hypothesis:test
 
 PYSETUPBUILDARGS+=     --system-zstd
 
 BUILDLINK_API_DEPENDS.zstd+=   zstd>=1.4.5
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/py-mutagen/Makefile
diff -u pkgsrc/audio/py-mutagen/Makefile:1.24 pkgsrc/audio/py-mutagen/Makefile:1.25
--- pkgsrc/audio/py-mutagen/Makefile:1.24       Wed Aug  5 16:33:52 2020
+++ pkgsrc/audio/py-mutagen/Makefile    Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2020/08/05 16:33:52 adam Exp $
+# $NetBSD: Makefile,v 1.25 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      mutagen-1.43.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,7 @@ HOMEPAGE=     https://github.com/quodlibet/m
 COMMENT=       Audio metadata handling for Python
 LICENSE=       gnu-gpl-v2
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= test:test hypothesis:test
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/converters/py-chardet/Makefile
diff -u pkgsrc/converters/py-chardet/Makefile:1.25 pkgsrc/converters/py-chardet/Makefile:1.26
--- pkgsrc/converters/py-chardet/Makefile:1.25  Sat May 16 08:43:55 2020
+++ pkgsrc/converters/py-chardet/Makefile       Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/05/16 08:43:55 adam Exp $
+# $NetBSD: Makefile,v 1.26 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      chardet-3.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,12 +11,14 @@ COMMENT=    Character encoding auto-detecti
 LICENSE=       gnu-lgpl-v2.1
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 TEST_DEPENDS+= ${PYPKGPREFIX}-py-[0-9]*:../../devel/py-py
 
+PYTHON_VERSIONED_DEPENDENCIES= hypothesis:test
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} chardetect chardetect-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-attrs/Makefile
diff -u pkgsrc/devel/py-attrs/Makefile:1.16 pkgsrc/devel/py-attrs/Makefile:1.17
--- pkgsrc/devel/py-attrs/Makefile:1.16 Sat May 16 09:03:22 2020
+++ pkgsrc/devel/py-attrs/Makefile      Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/05/16 09:03:22 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      attrs-19.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,10 @@ LICENSE=    mit
 TEST_DEPENDS+= ${PYPKGPREFIX}-Pympler-[0-9]*:../../devel/py-Pympler
 TEST_DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 TEST_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/devel/py-fuzzywuzzy/Makefile
diff -u pkgsrc/devel/py-fuzzywuzzy/Makefile:1.2 pkgsrc/devel/py-fuzzywuzzy/Makefile:1.3
--- pkgsrc/devel/py-fuzzywuzzy/Makefile:1.2     Sat May 16 17:13:40 2020
+++ pkgsrc/devel/py-fuzzywuzzy/Makefile Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/16 17:13:40 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      fuzzywuzzy-0.18.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,9 @@ LICENSE=      gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-Levenshtein-[0-9]*:../../textproc/py-Levenshtein
 TEST_DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/devel/py-pyrsistent/Makefile
diff -u pkgsrc/devel/py-pyrsistent/Makefile:1.7 pkgsrc/devel/py-pyrsistent/Makefile:1.8
--- pkgsrc/devel/py-pyrsistent/Makefile:1.7     Sat May 16 16:35:24 2020
+++ pkgsrc/devel/py-pyrsistent/Makefile Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/05/16 16:35:24 adam Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      pyrsistent-0.16.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,9 @@ LICENSE=      mit
 
 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
+
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-test4/Makefile
diff -u pkgsrc/devel/py-test4/Makefile:1.1 pkgsrc/devel/py-test4/Makefile:1.2
--- pkgsrc/devel/py-test4/Makefile:1.1  Sat May 16 07:51:58 2020
+++ pkgsrc/devel/py-test4/Makefile      Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/05/16 07:51:58 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      pytest-4.6.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -20,7 +20,6 @@ DEPENDS+=     ${PYPKGPREFIX}-six>=1.10.0:../
 DEPENDS+=      ${PYPKGPREFIX}-wcwidth-[0-9]*:../../devel/py-wcwidth
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 TEST_DEPENDS+= ${PYPKGPREFIX}-argcomplete-[0-9]*:../../devel/py-argcomplete
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=3.56:../../devel/py-hypothesis
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 
@@ -35,6 +34,7 @@ DEPENDS+=     ${PYPKGPREFIX}-importlib-metad
 .endif
 
 PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 USE_LANGUAGES= # none
 USE_TOOLS+=    bash:build

Index: pkgsrc/net/py-subunit/Makefile
diff -u pkgsrc/net/py-subunit/Makefile:1.2 pkgsrc/net/py-subunit/Makefile:1.3
--- pkgsrc/net/py-subunit/Makefile:1.2  Sun Apr 12 11:47:40 2020
+++ pkgsrc/net/py-subunit/Makefile      Tue Oct  6 10:51:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/04/12 11:47:40 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/10/06 10:51:21 wiz Exp $
 
 DISTNAME=      python-subunit-1.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
@@ -13,9 +13,10 @@ LICENSE=     apache-2.0 OR modified-bsd
 DEPENDS+=      ${PYPKGPREFIX}-extras-[0-9]*:../../devel/py-extras
 DEPENDS+=      ${PYPKGPREFIX}-testtools>=0.9.34:../../devel/py-testtools
 TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 TEST_DEPENDS+= ${PYPKGPREFIX}-testscenarios-[0-9]*:../../devel/py-testscenarios
 
+PYTHON_VERSIONED_DEPENDENCIES= hypothesis:test
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -30,4 +31,5 @@ do-test:
        cd ${WRKSRC}/python && ${PYTHONBIN} -m unittest discover -v
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-argon2-cffi/Makefile
diff -u pkgsrc/security/py-argon2-cffi/Makefile:1.3 pkgsrc/security/py-argon2-cffi/Makefile:1.4
--- pkgsrc/security/py-argon2-cffi/Makefile:1.3 Sun May 17 19:34:12 2020
+++ pkgsrc/security/py-argon2-cffi/Makefile     Tue Oct  6 10:51:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/05/17 19:34:12 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/10/06 10:51:22 wiz Exp $
 
 DISTNAME=      argon2-cffi-20.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,9 @@ LICENSE=      mit
 
 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
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27

Index: pkgsrc/security/py-cryptography/Makefile
diff -u pkgsrc/security/py-cryptography/Makefile:1.79 pkgsrc/security/py-cryptography/Makefile:1.80
--- pkgsrc/security/py-cryptography/Makefile:1.79       Sun May 17 19:34:12 2020
+++ pkgsrc/security/py-cryptography/Makefile    Tue Oct  6 10:51:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2020/05/17 19:34:12 adam Exp $
+# $NetBSD: Makefile,v 1.80 2020/10/06 10:51:22 wiz Exp $
 
 DISTNAME=      cryptography-2.9.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,12 +16,12 @@ DEPENDS+=   ${PYPKGPREFIX}-cparser>=2.10:.
 DEPENDS+=      ${PYPKGPREFIX}-idna>=2.1:../../www/py-idna
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-cryptography_vectors-[0-9]*:../../security/py-cryptography_vectors
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=1.11.4:../../devel/py-hypothesis
 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
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27

Index: pkgsrc/security/py-nacl/Makefile
diff -u pkgsrc/security/py-nacl/Makefile:1.7 pkgsrc/security/py-nacl/Makefile:1.8
--- pkgsrc/security/py-nacl/Makefile:1.7        Fri May 29 06:07:23 2020
+++ pkgsrc/security/py-nacl/Makefile    Tue Oct  6 10:51:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/05/29 06:07:23 adam Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/06 10:51:22 wiz Exp $
 
 DISTNAME=      PyNaCl-1.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl:S/^py//}
@@ -13,9 +13,9 @@ LICENSE=      apache-2.0
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-cffi>=1.4.1:../../devel/py-cffi
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=3.27.0:../../devel/py-hypothesis
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 MAKE_ENV+=     SODIUM_INSTALL=system
 

Index: pkgsrc/sysutils/py-eliot17/Makefile
diff -u pkgsrc/sysutils/py-eliot17/Makefile:1.1 pkgsrc/sysutils/py-eliot17/Makefile:1.2
--- pkgsrc/sysutils/py-eliot17/Makefile:1.1     Wed Jul  1 08:52:38 2020
+++ pkgsrc/sysutils/py-eliot17/Makefile Tue Oct  6 10:51:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/07/01 08:52:38 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/10/06 10:51:22 wiz Exp $
 
 DISTNAME=      eliot-1.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,10 +14,10 @@ DEPENDS+=   ${PYPKGPREFIX}-ZopeInterface-[
 DEPENDS+=      ${PYPKGPREFIX}-boltons>=19.0.1:../../devel/py-boltons
 DEPENDS+=      ${PYPKGPREFIX}-pyrsistent>=0.11.8:../../devel/py-pyrsistent
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=1.14.0:../../devel/py-hypothesis
 TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/time/py-dateutil/Makefile
diff -u pkgsrc/time/py-dateutil/Makefile:1.28 pkgsrc/time/py-dateutil/Makefile:1.29
--- pkgsrc/time/py-dateutil/Makefile:1.28       Mon May 18 10:40:11 2020
+++ pkgsrc/time/py-dateutil/Makefile    Tue Oct  6 10:51:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/05/18 10:40:11 adam Exp $
+# $NetBSD: Makefile,v 1.29 2020/10/06 10:51:22 wiz Exp $
 
 DISTNAME=      python-dateutil-2.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -13,9 +13,9 @@ LICENSE=      modified-bsd
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.5:../../lang/py-six
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 
 PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}

Prev by Date: CVS commit: pkgsrc/devel
Next by Date: CVS commit: pkgsrc/devel/py-hypothesis
Previous by Thread: CVS commit: pkgsrc/devel
Next by Thread: CVS commit: pkgsrc/devel/py-hypothesis
Indexes:

Home | Main Index | Thread Index | Old Index