CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 25 Jan 2022 09:05:12 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 25 09:05:12 UTC 2022

Modified Files:
        pkgsrc/devel/py-argcomplete: Makefile
        pkgsrc/devel/py-flake8: Makefile
        pkgsrc/devel/py-pluggy: Makefile
        pkgsrc/devel/py-test4: Makefile
        pkgsrc/devel/py-tox: Makefile
        pkgsrc/lang/py-inflect: Makefile
        pkgsrc/security/py-signedjson: Makefile
        pkgsrc/textproc/py-jsonpickle: Makefile
        pkgsrc/textproc/py-jsonschema: Makefile
        pkgsrc/textproc/py-pallets-sphinx-themes: Makefile

Log Message:
*: use versioned_dependencies.mk for py-importlib-metadata


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/py-argcomplete/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/py-flake8/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-pluggy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-test4/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-tox/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/py-inflect/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-signedjson/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/py-jsonpickle/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/py-jsonschema/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/py-pallets-sphinx-themes/Makefile

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

Modified files:

Index: pkgsrc/devel/py-argcomplete/Makefile
diff -u pkgsrc/devel/py-argcomplete/Makefile:1.26 pkgsrc/devel/py-argcomplete/Makefile:1.27
--- pkgsrc/devel/py-argcomplete/Makefile:1.26   Wed Jan  5 15:41:01 2022
+++ pkgsrc/devel/py-argcomplete/Makefile        Tue Jan 25 09:05:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/01/05 15:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/25 09:05:10 wiz Exp $
 
 DISTNAME=      argcomplete-1.12.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-pexpect-[0
 TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.23:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 
 USE_LANGUAGES= # none
@@ -25,4 +25,5 @@ USE_LANGUAGES=        # none
 USE_PKG_RESOURCES=     yes
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-flake8/Makefile
diff -u pkgsrc/devel/py-flake8/Makefile:1.40 pkgsrc/devel/py-flake8/Makefile:1.41
--- pkgsrc/devel/py-flake8/Makefile:1.40        Wed Jan  5 15:41:04 2022
+++ pkgsrc/devel/py-flake8/Makefile     Tue Jan 25 09:05:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2022/01/05 15:41:04 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2022/01/25 09:05:10 wiz Exp $
 
 DISTNAME=      flake8-3.9.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ DEPENDS+=     ${PYPKGPREFIX}-functools32-[0-
 DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 .endif
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=2.0.0:../../devel/py-mock
@@ -36,8 +36,12 @@ post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} flake8 flake8-${PYVERSSUFFIX} || ${TRUE}
 
+# as of 3.9.2
+# 21 failed, 460 passed, 1 error
+TEST_ENV+=     PYTHONPATH=${WRKSRC}/build/lib
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pluggy/Makefile
diff -u pkgsrc/devel/py-pluggy/Makefile:1.18 pkgsrc/devel/py-pluggy/Makefile:1.19
--- pkgsrc/devel/py-pluggy/Makefile:1.18        Thu Jan 13 19:31:22 2022
+++ pkgsrc/devel/py-pluggy/Makefile     Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/01/13 19:31:22 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      pluggy-0.13.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,10 @@ LICENSE=    mit
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+=        test:test setuptools_scm:build
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/devel/py-test4/Makefile
diff -u pkgsrc/devel/py-test4/Makefile:1.6 pkgsrc/devel/py-test4/Makefile:1.7
--- pkgsrc/devel/py-test4/Makefile:1.6  Thu Jan 13 19:31:23 2022
+++ pkgsrc/devel/py-test4/Makefile      Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/13 19:31:23 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      pytest-4.6.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -29,7 +29,7 @@ DEPENDS+=     ${PYPKGPREFIX}-pathlib2>=2.2.0
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 .endif
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 
 PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools

Index: pkgsrc/devel/py-tox/Makefile
diff -u pkgsrc/devel/py-tox/Makefile:1.25 pkgsrc/devel/py-tox/Makefile:1.26
--- pkgsrc/devel/py-tox/Makefile:1.25   Thu Jan 13 19:31:22 2022
+++ pkgsrc/devel/py-tox/Makefile        Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/01/13 19:31:22 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      tox-3.20.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -28,7 +28,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-xdist
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 
 PYTHON_VERSIONED_DEPENDENCIES+=        packaging

Index: pkgsrc/lang/py-inflect/Makefile
diff -u pkgsrc/lang/py-inflect/Makefile:1.3 pkgsrc/lang/py-inflect/Makefile:1.4
--- pkgsrc/lang/py-inflect/Makefile:1.3 Thu Jan 13 19:31:24 2022
+++ pkgsrc/lang/py-inflect/Makefile     Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/13 19:31:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      inflect-4.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,12 +11,12 @@ HOMEPAGE=   https://github.com/jazzband/in
 COMMENT=       Correctly generate plurals, ordinals, indefinite articles for English
 LICENSE=       mit
 
-PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+=        setuptools_scm:build
 
 .include "../../lang/python/pyversion.mk"
 
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 
 USE_LANGUAGES= # none

Index: pkgsrc/security/py-signedjson/Makefile
diff -u pkgsrc/security/py-signedjson/Makefile:1.4 pkgsrc/security/py-signedjson/Makefile:1.5
--- pkgsrc/security/py-signedjson/Makefile:1.4  Thu Jan 13 19:31:24 2022
+++ pkgsrc/security/py-signedjson/Makefile      Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/13 19:31:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      signedjson-1.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=      Signs JSON objects with ED25519
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-canonicaljson>=1.0.0:../../devel/py-canonicaljson
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
 DEPENDS+=      ${PYPKGPREFIX}-nacl>=0.3.0:../../security/py-nacl
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=3.5:../../devel/py-typing-extensions
 DEPENDS+=      ${PYPKGPREFIX}-unpaddedbase64>=1.0.1:../../devel/py-unpaddedbase64
@@ -21,6 +20,7 @@ DEPENDS+=     ${PYPKGPREFIX}-typing-[0-9]*:.
 .endif
 
 PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/textproc/py-jsonpickle/Makefile
diff -u pkgsrc/textproc/py-jsonpickle/Makefile:1.11 pkgsrc/textproc/py-jsonpickle/Makefile:1.12
--- pkgsrc/textproc/py-jsonpickle/Makefile:1.11 Thu Jan 13 19:31:25 2022
+++ pkgsrc/textproc/py-jsonpickle/Makefile      Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/13 19:31:25 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      jsonpickle-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,12 +16,12 @@ TEST_DEPENDS+=      ${PYPKGPREFIX}-test-cov-[
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+=        setuptools_scm:build
 
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests

Index: pkgsrc/textproc/py-jsonschema/Makefile
diff -u pkgsrc/textproc/py-jsonschema/Makefile:1.19 pkgsrc/textproc/py-jsonschema/Makefile:1.20
--- pkgsrc/textproc/py-jsonschema/Makefile:1.19 Thu Jan 13 19:31:25 2022
+++ pkgsrc/textproc/py-jsonschema/Makefile      Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/01/13 19:31:25 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      jsonschema-3.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -20,12 +20,12 @@ TEST_DEPENDS+=      ${PYPKGPREFIX}-twisted-[0
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-functools32-[0-9]*:../../devel/py-functools32
 .elif ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+=        importlib-metadata
 .endif
 
 USE_PKG_RESOURCES=     yes
 
-PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+=        setuptools_scm:build
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/textproc/py-pallets-sphinx-themes/Makefile
diff -u pkgsrc/textproc/py-pallets-sphinx-themes/Makefile:1.6 pkgsrc/textproc/py-pallets-sphinx-themes/Makefile:1.7
--- pkgsrc/textproc/py-pallets-sphinx-themes/Makefile:1.6       Tue Jan  4 20:55:01 2022
+++ pkgsrc/textproc/py-pallets-sphinx-themes/Makefile   Tue Jan 25 09:05:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:55:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/25 09:05:11 wiz Exp $
 
 DISTNAME=      Pallets-Sphinx-Themes-1.2.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,13 +11,13 @@ HOMEPAGE=   https://github.com/pallets/pal
 COMMENT=       Sphinx themes for Pallets and related projects
 LICENSE=       modified-bsd
 
-PYTHON_VERSIONED_DEPENDENCIES= sphinx
+PYTHON_VERSIONED_DEPENDENCIES+=        sphinx
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
+PYTHON_VERSIONED_DEPENDENCIES+= importlib-metadata
 .endif
 
 .include "../../lang/python/egg.mk"

Prev by Date: CVS commit: pkgsrc/lang/python
Next by Date: CVS commit: pkgsrc/devel/py-importlib-metadata
Previous by Thread: CVS commit: pkgsrc/lang/python
Next by Thread: CVS commit: pkgsrc/devel/py-importlib-metadata
Indexes:

Home | Main Index | Thread Index | Old Index