pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: use versioned_dependencies.mk for py-importlib-meta...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f5562c0acc1e
branches: trunk
changeset: 372465:f5562c0acc1e
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Jan 25 09:05:10 2022 +0000
description:
*: use versioned_dependencies.mk for py-importlib-metadata
diffstat:
devel/py-argcomplete/Makefile | 5 +++--
devel/py-flake8/Makefile | 8 ++++++--
devel/py-pluggy/Makefile | 6 +++---
devel/py-test4/Makefile | 4 ++--
devel/py-tox/Makefile | 4 ++--
lang/py-inflect/Makefile | 6 +++---
security/py-signedjson/Makefile | 4 ++--
textproc/py-jsonpickle/Makefile | 6 +++---
textproc/py-jsonschema/Makefile | 6 +++---
textproc/py-pallets-sphinx-themes/Makefile | 6 +++---
10 files changed, 30 insertions(+), 25 deletions(-)
diffs (235 lines):
diff -r 00602ee8e4fe -r f5562c0acc1e devel/py-argcomplete/Makefile
--- a/devel/py-argcomplete/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/devel/py-argcomplete/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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}-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_PKG_RESOURCES= yes
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 00602ee8e4fe -r f5562c0acc1e devel/py-flake8/Makefile
--- a/devel/py-flake8/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/devel/py-flake8/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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}-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 @@
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"
diff -r 00602ee8e4fe -r f5562c0acc1e devel/py-pluggy/Makefile
--- a/devel/py-pluggy/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/devel/py-pluggy/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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 @@
.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
diff -r 00602ee8e4fe -r f5562c0acc1e devel/py-test4/Makefile
--- a/devel/py-test4/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/devel/py-test4/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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 @@
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
diff -r 00602ee8e4fe -r f5562c0acc1e devel/py-tox/Makefile
--- a/devel/py-tox/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/devel/py-tox/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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 @@
.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
diff -r 00602ee8e4fe -r f5562c0acc1e lang/py-inflect/Makefile
--- a/lang/py-inflect/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/lang/py-inflect/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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 @@
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
diff -r 00602ee8e4fe -r f5562c0acc1e security/py-signedjson/Makefile
--- a/security/py-signedjson/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/security/py-signedjson/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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 @@
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 @@
.endif
PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build
+PYTHON_VERSIONED_DEPENDENCIES+= importlib-metadata
USE_LANGUAGES= # none
diff -r 00602ee8e4fe -r f5562c0acc1e textproc/py-jsonpickle/Makefile
--- a/textproc/py-jsonpickle/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/textproc/py-jsonpickle/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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-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
diff -r 00602ee8e4fe -r f5562c0acc1e textproc/py-jsonschema/Makefile
--- a/textproc/py-jsonschema/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/textproc/py-jsonschema/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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 @@
.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 && \
diff -r 00602ee8e4fe -r f5562c0acc1e textproc/py-pallets-sphinx-themes/Makefile
--- a/textproc/py-pallets-sphinx-themes/Makefile Tue Jan 25 09:04:29 2022 +0000
+++ b/textproc/py-pallets-sphinx-themes/Makefile Tue Jan 25 09:05:10 2022 +0000
@@ -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 @@
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"
Home |
Main Index |
Thread Index |
Old Index