diff options
44 files changed, 125 insertions, 103 deletions
diff --git a/archivers/py-zipp1/Makefile b/archivers/py-zipp1/Makefile index b0efeb8599b..8a3dc35b0a9 100644 --- a/archivers/py-zipp1/Makefile +++ b/archivers/py-zipp1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/04 20:52:31 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2022/01/13 19:31:20 wiz Exp $ DISTNAME= zipp-1.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/jaraco/zipp COMMENT= Backport of pathlib-compatible object wrapper for zip files (for Python 2.x) LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2 TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2 TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2 @@ -21,6 +20,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2 TEST_DEPENDS+= ${PYPKGPREFIX}-func_timeout-[0-9]*:../../devel/py-func_timeout USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/py-zopfli/Makefile b/archivers/py-zopfli/Makefile index 75ee5658a1c..bf9fbe8fe79 100644 --- a/archivers/py-zopfli/Makefile +++ b/archivers/py-zopfli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2022/01/04 20:52:31 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2022/01/13 19:31:20 wiz Exp $ DISTNAME= zopfli-0.1.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,8 @@ HOMEPAGE= https://github.com/fonttools/py-zopfli COMMENT= Zopfli module for Python LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-apipkg/Makefile b/devel/py-apipkg/Makefile index 4ae67273c5c..6a3a077bdd8 100644 --- a/devel/py-apipkg/Makefile +++ b/devel/py-apipkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/04 20:52:49 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2022/01/13 19:31:21 wiz Exp $ DISTNAME= apipkg-1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,9 +11,10 @@ HOMEPAGE= https://github.com/pytest-dev/apipkg COMMENT= Namespace control and lazy-import mechanism LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-automat/Makefile b/devel/py-automat/Makefile index 889ddc05402..86d1d6bbb77 100644 --- a/devel/py-automat/Makefile +++ b/devel/py-automat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:01 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2022/01/13 19:31:21 wiz Exp $ DISTNAME= Automat-0.8.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,7 +12,6 @@ COMMENT= Self-service finite-state machines for the programmer on the go LICENSE= mit BUILD_DEPENDS+= ${PYPKGPREFIX}-m2r-[0-9]*:../../textproc/py-m2r -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-attrs>=16.1.0:../../devel/py-attrs DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six @@ -20,9 +19,12 @@ USE_LANGUAGES= # none USE_PKG_RESOURCES= yes +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} automat-visualize automat-visualize${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-backports.functools_lru_cache/Makefile b/devel/py-backports.functools_lru_cache/Makefile index 75a42f5bb88..e6669c47bec 100644 --- a/devel/py-backports.functools_lru_cache/Makefile +++ b/devel/py-backports.functools_lru_cache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/01/04 20:52:51 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2022/01/13 19:31:21 wiz Exp $ DISTNAME= backports.functools_lru_cache-1.6.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Backport of functools.lru_cache from Python 3.3 LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-backports-[0-9]*:../../devel/py-backports -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm5 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 diff --git a/devel/py-backports.os/Makefile b/devel/py-backports.os/Makefile index 43aa008f702..54345e48c6b 100644 --- a/devel/py-backports.os/Makefile +++ b/devel/py-backports.os/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2022/01/04 20:52:52 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2022/01/13 19:31:23 wiz Exp $ DISTNAME= backports.os-0.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= python-software-foundation DEPENDS+= ${PYPKGPREFIX}-backports-[0-9]*:../../devel/py-backports DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm5 PYTHON_VERSIONS_ACCEPTED= 27 # py-backports diff --git a/devel/py-configparser/Makefile b/devel/py-configparser/Makefile index 61d22234e92..daf0d8e821f 100644 --- a/devel/py-configparser/Makefile +++ b/devel/py-configparser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2022/01/04 20:52:57 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2022/01/13 19:31:21 wiz Exp $ DISTNAME= configparser-4.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/jaraco/configparser COMMENT= Updated configparser from Python 3.5 LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm +BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm5 DEPENDS+= ${PYPKGPREFIX}-backports-[0-9]*:../../devel/py-backports TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2 diff --git a/devel/py-execnet/Makefile b/devel/py-execnet/Makefile index 8ce419e56b3..b4301df851f 100644 --- a/devel/py-execnet/Makefile +++ b/devel/py-execnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/01/04 20:53:02 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2022/01/13 19:31:21 wiz Exp $ DISTNAME= execnet-1.9.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,13 +11,15 @@ HOMEPAGE= https://execnet.readthedocs.io/ COMMENT= Rapid multi-Python deployment LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} testing .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-filelock/Makefile b/devel/py-filelock/Makefile index 4d754fa6f4c..9c9fa3d6a08 100644 --- a/devel/py-filelock/Makefile +++ b/devel/py-filelock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/10 11:29:24 adam Exp $ +# $NetBSD: Makefile,v 1.6 2022/01/13 19:31:23 wiz Exp $ DISTNAME= filelock-3.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,15 +10,17 @@ HOMEPAGE= https://github.com/tox-dev/py-filelock COMMENT= Platform independent file lock LICENSE= unlicense -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-test>=4:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=1.4.2:../../devel/py-test-timeout USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + 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 --git a/devel/py-hgtools/Makefile b/devel/py-hgtools/Makefile index 62395180cdd..8e4ac8148d6 100644 --- a/devel/py-hgtools/Makefile +++ b/devel/py-hgtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:10 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2022/01/13 19:31:21 wiz Exp $ DISTNAME= hgtools-6.5.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,9 +11,10 @@ HOMEPAGE= https://github.com/jaraco/hgtools COMMENT= Classes and setuptools plugin for Mercurial and Git repositories LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-hyperscan/Makefile b/devel/py-hyperscan/Makefile index 03e1914091b..f7b78d21d81 100644 --- a/devel/py-hyperscan/Makefile +++ b/devel/py-hyperscan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:10 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2022/01/13 19:31:23 wiz Exp $ DISTNAME= hyperscan-0.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,9 +14,11 @@ LICENSE= mit USE_LANGUAGES= c USE_TOOLS+= pkg-config -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.11.1:../../devel/py-setuptools_scm BUILD_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + .include "../../devel/hyperscan/buildlink3.mk" .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-importlib-metadata/Makefile b/devel/py-importlib-metadata/Makefile index f124d8a5bbd..4314c257d54 100644 --- a/devel/py-importlib-metadata/Makefile +++ b/devel/py-importlib-metadata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2022/01/04 20:53:10 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2022/01/13 19:31:23 wiz Exp $ DISTNAME= importlib_metadata-2.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/} @@ -11,7 +11,6 @@ HOMEPAGE= https://importlib-metadata.readthedocs.io/ COMMENT= Read metadata from Python packages LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-fakefs-[0-9]*:../../devel/py-fakefs TEST_DEPENDS+= ${PYPKGPREFIX}-pep517-[0-9]*:../../devel/py-pep517 .include "../../lang/python/pyversion.mk" @@ -24,7 +23,7 @@ DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2 TEST_DEPENDS+= ${PYPKGPREFIX}-importlib-resources>=1.3:../../devel/py-importlib-resources .endif -PYTHON_VERSIONED_DEPENDENCIES+= packaging zipp +PYTHON_VERSIONED_DEPENDENCIES+= packaging zipp setuptools_scm:build USE_LANGUAGES= # none diff --git a/devel/py-importlib-resources/Makefile b/devel/py-importlib-resources/Makefile index 414c4f98abc..1b4562da605 100644 --- a/devel/py-importlib-resources/Makefile +++ b/devel/py-importlib-resources/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/01/04 20:53:10 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2022/01/13 19:31:23 wiz Exp $ DISTNAME= importlib_resources-3.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/} @@ -11,7 +11,6 @@ HOMEPAGE= https://importlib-resources.readthedocs.io/ COMMENT= Read resources from Python packages LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.4.1:../../devel/py-setuptools_scm .include "../../lang/python/pyversion.mk" .if ${_PYTHON_VERSION} == 27 DEPENDS+= ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2 @@ -21,10 +20,11 @@ DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing .endif .if ${_PYTHON_VERSION} < 38 PYTHON_VERSIONED_DEPENDENCIES+= zipp -.include "../../lang/python/versioned_dependencies.mk" .endif +PYTHON_VERSIONED_DEPENDENCIES+= setuptools_scm USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-iniconfig/Makefile b/devel/py-iniconfig/Makefile index 77ce23b0bbd..b71955c84e5 100644 --- a/devel/py-iniconfig/Makefile +++ b/devel/py-iniconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:11 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2022/01/13 19:31:23 wiz Exp $ DISTNAME= iniconfig-1.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,9 +11,10 @@ HOMEPAGE= https://github.com/RonnyPfannschmidt/iniconfig COMMENT= Brain-dead simple config-ini parsing LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile index e50db6b6cb7..7bb01de7733 100644 --- a/devel/py-jaraco.functools/Makefile +++ b/devel/py-jaraco.functools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:12 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2022/01/13 19:31:23 wiz Exp $ DISTNAME= jaraco.functools-2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,8 +11,6 @@ HOMEPAGE= https://github.com/jaraco/jaraco.functools COMMENT= Additional functools in the spirit of stdlib's functools LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm - .include "../../lang/python/pyversion.mk" .if ${_PYTHON_VERSION} == 27 DEPENDS+= ${PYPKGPREFIX}-backports.functools_lru_cache>=1.0.3:../../devel/py-backports.functools_lru_cache @@ -20,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-backports.functools_lru_cache>=1.0.3:../../devel/py-bac USE_LANGUAGES= # none -PYTHON_VERSIONED_DEPENDENCIES+= more-itertools +PYTHON_VERSIONED_DEPENDENCIES+= more-itertools setuptools_scm:build .include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/egg.mk" diff --git a/devel/py-path.py/Makefile b/devel/py-path.py/Makefile index 6ac2c915657..1d6a3dd76ea 100644 --- a/devel/py-path.py/Makefile +++ b/devel/py-path.py/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/01/04 20:53:20 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2022/01/13 19:31:22 wiz Exp $ DISTNAME= path.py-11.5.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/jaraco/path.py COMMENT= Module wrapper for os.path LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.5:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 @@ -19,7 +18,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar USE_LANGUAGES= # none -PYTHON_VERSIONED_DEPENDENCIES= packaging:test pygments:test +PYTHON_VERSIONED_DEPENDENCIES= packaging:test pygments:test setuptools_scm:build do-test: cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_path.py diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile index 7b47cd3a139..31d2f269253 100644 --- a/devel/py-pluggy/Makefile +++ b/devel/py-pluggy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2022/01/04 20:53:21 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2022/01/13 19:31:22 wiz Exp $ DISTNAME= pluggy-0.13.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,14 +11,12 @@ HOMEPAGE= https://github.com/pytest-dev/pluggy COMMENT= Plugin and hook calling mechanisms for python LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm - .include "../../lang/python/pyversion.mk" .if ${_PYTHON_VERSION} < 38 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata .endif -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES= test:test setuptools_scm:build USE_LANGUAGES= # none diff --git a/devel/py-plumbum/Makefile b/devel/py-plumbum/Makefile index 1c338740b9b..4a7ef64ca7f 100644 --- a/devel/py-plumbum/Makefile +++ b/devel/py-plumbum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:21 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2022/01/13 19:31:23 wiz Exp $ DISTNAME= plumbum-1.7.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://plumbum.readthedocs.io/ COMMENT= Plumbum: shell combinators library LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.4.3:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko TEST_DEPENDS+= ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov @@ -20,7 +19,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout-[0-9]*:../../devel/py-test-timeout USE_LANGUAGES= # none -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES= test:test setuptools_scm:build do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile index 3682c0f211e..228e261bf62 100644 --- a/devel/py-py/Makefile +++ b/devel/py-py/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/01/04 20:53:22 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2022/01/13 19:31:22 wiz Exp $ DISTNAME= py-1.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,9 +11,10 @@ HOMEPAGE= https://py.readthedocs.io/ COMMENT= Library with cross-python path, ini-parsing, io, code, log facilities LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-setuptools_scm_git_archive/Makefile b/devel/py-setuptools_scm_git_archive/Makefile index e58787d4904..ea148e8097a 100644 --- a/devel/py-setuptools_scm_git_archive/Makefile +++ b/devel/py-setuptools_scm_git_archive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:38 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2022/01/13 19:31:24 wiz Exp $ DISTNAME= setuptools_scm_git_archive-1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,9 +11,10 @@ HOMEPAGE= https://github.com/Changaco/setuptools_scm_git_archive COMMENT= Setuptools_scm plugin for git archives LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-singledispatch/Makefile b/devel/py-singledispatch/Makefile index 5e42c7f5465..efefff5c37f 100644 --- a/devel/py-singledispatch/Makefile +++ b/devel/py-singledispatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:39 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2022/01/13 19:31:22 wiz Exp $ DISTNAME= singledispatch-3.6.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://pypi.python.org/pypi/singledispatch COMMENT= Library brings functools.singledispatch from Python 3.4 LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.4.1:../../devel/py-setuptools_scm +BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.4.1:../../devel/py-setuptools_scm5 DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six USE_LANGUAGES= # none diff --git a/devel/py-test-forked/Makefile b/devel/py-test-forked/Makefile index 0649a3b4a17..2f1f814737a 100644 --- a/devel/py-test-forked/Makefile +++ b/devel/py-test-forked/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/01/04 20:53:41 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2022/01/13 19:31:22 wiz Exp $ DISTNAME= pytest-forked-1.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -11,9 +11,7 @@ HOMEPAGE= https://github.com/pytest-dev/pytest-forked COMMENT= Run tests in isolated forked subprocesses LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm - -PYTHON_VERSIONED_DEPENDENCIES= test +PYTHON_VERSIONED_DEPENDENCIES= test setuptools_scm:build USE_LANGUAGES= # none diff --git a/devel/py-test-runner/Makefile b/devel/py-test-runner/Makefile index 0f6df07d199..31c26012262 100644 --- a/devel/py-test-runner/Makefile +++ b/devel/py-test-runner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2022/01/04 20:53:42 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2022/01/13 19:31:22 wiz Exp $ DISTNAME= pytest-runner-5.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -11,13 +11,12 @@ HOMEPAGE= https://github.com/pytest-dev/pytest-runner COMMENT= Invoke py.test as distutils command with dependency resolution LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm # introduces dependency cycle #TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 USE_LANGUAGES= # none -PYTHON_VERSIONED_DEPENDENCIES= test +PYTHON_VERSIONED_DEPENDENCIES= test setuptools_scm do-test: cd ${WRKSRC} && pytest-${PYVERSSUFFIX} diff --git a/devel/py-test-xdist/Makefile b/devel/py-test-xdist/Makefile index 564181b5544..edb61ea03fc 100644 --- a/devel/py-test-xdist/Makefile +++ b/devel/py-test-xdist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2022/01/04 20:53:43 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2022/01/13 19:31:22 wiz Exp $ DISTNAME= pytest-xdist-1.34.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -14,10 +14,9 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-execnet>=1.1:../../devel/py-execnet DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-test-forked-[0-9]*:../../devel/py-test-forked -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-filelock-[0-9]*:../../devel/py-filelock -PYTHON_VERSIONED_DEPENDENCIES= test +PYTHON_VERSIONED_DEPENDENCIES= test setuptools_scm:build USE_LANGUAGES= # none diff --git a/devel/py-test4/Makefile b/devel/py-test4/Makefile index 575cc301d24..9a4e7231f57 100644 --- a/devel/py-test4/Makefile +++ b/devel/py-test4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/01/05 20:47:36 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2022/01/13 19:31:23 wiz Exp $ DISTNAME= pytest-4.6.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -18,7 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-pluggy>=0.12:../../devel/py-pluggy DEPENDS+= ${PYPKGPREFIX}-py>=1.5.0:../../devel/py-py DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six 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}-nose-[0-9]*:../../devel/py-nose TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests @@ -36,6 +35,7 @@ DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metad PYTHON_VERSIONED_DEPENDENCIES+= more-itertools PYTHON_VERSIONED_DEPENDENCIES+= hypothesis:test PYTHON_VERSIONED_DEPENDENCIES+= packaging +PYTHON_VERSIONED_DEPENDENCIES+= setuptools_scm:build USE_PKG_RESOURCES= yes diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index b517d1589d7..bfc8b4189c6 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2022/01/05 15:41:08 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2022/01/13 19:31:22 wiz Exp $ DISTNAME= tox-3.20.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://tox.readthedocs.io/ COMMENT= Virtualenv-based automation of test activities LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-filelock>=3.0.0:../../devel/py-filelock DEPENDS+= ${PYPKGPREFIX}-pluggy>=0.12.0:../../devel/py-pluggy DEPENDS+= ${PYPKGPREFIX}-py>=1.4.17:../../devel/py-py @@ -34,6 +33,7 @@ DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metad PYTHON_VERSIONED_DEPENDENCIES+= packaging PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= setuptools_scm:build USE_PKG_RESOURCES= yes diff --git a/devel/py-visitor/Makefile b/devel/py-visitor/Makefile index 3a17510f79f..5a4baf5c515 100644 --- a/devel/py-visitor/Makefile +++ b/devel/py-visitor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:47 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2022/01/13 19:31:22 wiz Exp $ DISTNAME= visitor-0.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,6 @@ COMMENT= Tiny pythonic visitor implementation LICENSE= mit #DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -#BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm USE_LANGUAGES= # none diff --git a/lang/py-asttokens/Makefile b/lang/py-asttokens/Makefile index 12baa10a51f..0edc33466c1 100644 --- a/lang/py-asttokens/Makefile +++ b/lang/py-asttokens/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2022/01/04 20:54:08 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2022/01/13 19:31:24 wiz Exp $ DISTNAME= asttokens-2.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,14 +11,13 @@ HOMEPAGE= https://github.com/gristlabs/asttokens COMMENT= Annotate AST trees with source code positions LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-astroid-[0-9]*:../../devel/py-astroid TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test USE_LANGUAGES= # none -PYTHON_VERSIONED_DEPENDENCIES+= pip:build +PYTHON_VERSIONED_DEPENDENCIES+= pip:build setuptools_scm:build .include "../../lang/python/pyversion.mk" .if ${_PYTHON_VERSION} == 27 diff --git a/lang/py-inflect/Makefile b/lang/py-inflect/Makefile index fa9e42aeb1a..31c247f0e0a 100644 --- a/lang/py-inflect/Makefile +++ b/lang/py-inflect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:08 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2022/01/13 19:31:24 wiz Exp $ DISTNAME= inflect-4.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/jazzband/inflect COMMENT= Correctly generate plurals, ordinals, indefinite articles for English LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.4.1:../../devel/py-setuptools_scm +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build .include "../../lang/python/pyversion.mk" @@ -22,4 +22,5 @@ DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-meta USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/python/versioned_dependencies.mk b/lang/python/versioned_dependencies.mk index af8353a2b41..69ca455eb4a 100644 --- a/lang/python/versioned_dependencies.mk +++ b/lang/python/versioned_dependencies.mk @@ -1,4 +1,4 @@ -# $NetBSD: versioned_dependencies.mk,v 1.57 2021/12/31 13:25:18 adam Exp $ +# $NetBSD: versioned_dependencies.mk,v 1.58 2022/01/13 19:31:25 wiz Exp $ # # This file determines which separate distribution of a Python # package is used as dependency, depending on the Python version @@ -9,7 +9,7 @@ # PYTHON_VERSIONED_DEPENDENCIES # The Python package which should be added as a dependency. # -# Possible values: Pmw Pillow X cairo html2text hypothesis ipython jsonlib markdown more-itertools pip packaging pygments pyparsing python-digest rsa setuptools sphinx test zipp +# Possible values: Pmw Pillow X cairo html2text hypothesis ipython jsonlib markdown more-itertools pip packaging pygments pyparsing python-digest rsa setuptools setuptools_scm sphinx test zipp # Default: (nothing) # @@ -37,6 +37,7 @@ _SUPPORTED_PACKAGES+= pyparsing devel/py-pyparsing2 devel/py-pyparsing _SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest _SUPPORTED_PACKAGES+= rsa security/py-rsa40 security/py-rsa _SUPPORTED_PACKAGES+= setuptools devel/py-setuptools44 devel/py-setuptools +_SUPPORTED_PACKAGES+= setuptools_scm devel/py-setuptools_scm5 devel/py-setuptools_scm _SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx _SUPPORTED_PACKAGES+= test devel/py-test4 devel/py-test _SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile index 57775e3523f..76a9fa63543 100644 --- a/math/py-mpmath/Makefile +++ b/math/py-mpmath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2022/01/04 20:54:14 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2022/01/13 19:31:24 wiz Exp $ DISTNAME= mpmath-1.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,14 +12,16 @@ HOMEPAGE= http://mpmath.org/ COMMENT= Python library for arbitrary-precision FP arithmetic LICENSE= modified-bsd -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm # py-gmpy provides faster backend DEPENDS+= ${PYPKGPREFIX}-gmpy-[0-9]*:../../math/py-gmpy TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + PYSETUPTESTTARGET= pytest .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-portend/Makefile b/net/py-portend/Makefile index 9bb5a9f9af4..af66ed81de4 100644 --- a/net/py-portend/Makefile +++ b/net/py-portend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:30 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2022/01/13 19:31:21 wiz Exp $ DISTNAME= portend-2.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,11 +12,10 @@ COMMENT= TCP port monitoring utilities LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-tempora>=1.8:../../time/py-tempora -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar # missing: pytest-black-multipy -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES= test:test setuptools_scm:build USE_LANGUAGES= # none diff --git a/security/py-acme-tiny/Makefile b/security/py-acme-tiny/Makefile index adce9522b34..cc4171fa56a 100644 --- a/security/py-acme-tiny/Makefile +++ b/security/py-acme-tiny/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:19 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2022/01/13 19:31:24 wiz Exp $ DISTNAME= acme-tiny-5.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,16 +11,18 @@ HOMEPAGE= https://github.com/diafygi/acme-tiny COMMENT= Tiny script to issue and renew TLS certs from Let's Encrypt LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm DEPENDS+= openssl-[0-9]*:../../security/openssl USE_LANGUAGES= # none USE_PKG_RESOURCES= yes +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} acme-tiny acme-tiny-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile index e9ff9739725..6caca0043ec 100644 --- a/security/py-keyrings.alt/Makefile +++ b/security/py-keyrings.alt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:42 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2022/01/13 19:31:24 wiz Exp $ DISTNAME= keyrings.alt-3.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,10 +11,12 @@ HOMEPAGE= https://github.com/jaraco/keyrings.alt COMMENT= Alternate keyring implementations LICENSE= mit -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile index 2826f8f996d..02bffb98aed 100644 --- a/security/py-signedjson/Makefile +++ b/security/py-signedjson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/01/08 16:14:31 adam Exp $ +# $NetBSD: Makefile,v 1.4 2022/01/13 19:31:24 wiz Exp $ DISTNAME= signedjson-1.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/matrix-org/ COMMENT= Signs JSON objects with ED25519 signatures LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm 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 @@ -21,7 +20,10 @@ DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64>=1.0.1:../../devel/py-unpaddedbase64 DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing .endif +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/py-salt-pepper/Makefile b/sysutils/py-salt-pepper/Makefile index b2695d4787b..96b29a58c49 100644 --- a/sysutils/py-salt-pepper/Makefile +++ b/sysutils/py-salt-pepper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:22 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2022/01/13 19:31:24 wiz Exp $ DISTNAME= salt-pepper-0.7.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,15 +11,16 @@ HOMEPAGE= https://github.com/saltstack/pepper COMMENT= CLI front-end to a running salt-api system LICENSE= apache-2.0 -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm - USE_LANGUAGES= # none USE_PKG_RESOURCES= yes +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} pepper pepper-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-black/Makefile b/textproc/py-black/Makefile index 86a0f261fee..4da1dca6657 100644 --- a/textproc/py-black/Makefile +++ b/textproc/py-black/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/11 09:13:29 adam Exp $ +# $NetBSD: Makefile,v 1.5 2022/01/13 19:31:25 wiz Exp $ DISTNAME= black-21.12b0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,6 +21,7 @@ DEPENDS+= ${PYPKGPREFIX}-tomli>=0.2.6:../../textproc/py-tomli DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.10.0.2:../../devel/py-typing-extensions # only for blackd: DEPENDS+= ${PYPKGPREFIX}-aiohttp>=3.7.4:../../www/py-aiohttp +TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" @@ -36,5 +37,9 @@ post-install: ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} .endfor +TEST_ENV+= PYTHONPATH=${WRKSRC}/build/lib +do-test: + cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-jsonpickle/Makefile b/textproc/py-jsonpickle/Makefile index da408c7e15a..2964c469a38 100644 --- a/textproc/py-jsonpickle/Makefile +++ b/textproc/py-jsonpickle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/01/04 20:54:57 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2022/01/13 19:31:25 wiz Exp $ DISTNAME= jsonpickle-2.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://jsonpickle.github.io/ COMMENT= Python library for serializing any arbitrary object graph into JSON LICENSE= modified-bsd -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.4.1:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 @@ -22,8 +21,11 @@ DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-meta USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + 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 --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile index dc148be96f2..b7a34ce0e7c 100644 --- a/textproc/py-jsonschema/Makefile +++ b/textproc/py-jsonschema/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2022/01/05 15:41:25 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2022/01/13 19:31:25 wiz Exp $ DISTNAME= jsonschema-3.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/Julian/jsonschema COMMENT= Implementation of JSON Schema for Python LICENSE= modified-bsd -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs DEPENDS+= ${PYPKGPREFIX}-pyrsistent>=0.14.0:../../devel/py-pyrsistent DEPENDS+= ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six @@ -26,6 +25,8 @@ DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-meta USE_PKG_RESOURCES= yes +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build + post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} jsonschema jsonschema-${PYVERSSUFFIX} || ${TRUE} @@ -34,4 +35,5 @@ do-test: cd ${WRKSRC}/jsonschema && ${PYTHONBIN} -m unittest discover -v .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/py-dateutil/Makefile b/time/py-dateutil/Makefile index aa9a7a3e93d..13ec1eded01 100644 --- a/time/py-dateutil/Makefile +++ b/time/py-dateutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2022/01/04 20:55:11 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2022/01/13 19:31:24 wiz Exp $ DISTNAME= python-dateutil-2.8.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} @@ -12,11 +12,11 @@ COMMENT= Extensions to the standard datetime module 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 PYTHON_VERSIONED_DEPENDENCIES= test:test PYTHON_VERSIONED_DEPENDENCIES+= hypothesis:test +PYTHON_VERSIONED_DEPENDENCIES+= setuptools_scm:build do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} diff --git a/time/py-tempora/Makefile b/time/py-tempora/Makefile index ac69607c6a6..6a3f59dd125 100644 --- a/time/py-tempora/Makefile +++ b/time/py-tempora/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:28 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2022/01/13 19:31:25 wiz Exp $ DISTNAME= tempora-1.14.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,12 +14,12 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-jaraco.functools-[0-9]*:../../devel/py-jaraco.functools DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar>=0.9.1:../../devel/py-test-sugar PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build USE_LANGUAGES= # none diff --git a/www/py-cheroot/Makefile b/www/py-cheroot/Makefile index 05bfc5777bf..f0a7251c47b 100644 --- a/www/py-cheroot/Makefile +++ b/www/py-cheroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2022/01/05 15:41:29 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2022/01/13 19:31:25 wiz Exp $ DISTNAME= cheroot-6.5.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,6 @@ COMMENT= High-performance, pure-Python HTTP server used by CherryPy LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm_git_archive>=1.0:../../devel/py-setuptools_scm_git_archive TEST_DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.5.3:../../devel/py-coverage @@ -45,6 +44,7 @@ do-test: cd ${WRKSRC} && py.test-${PYVERSSUFFIX} PYTHON_VERSIONED_DEPENDENCIES+= more-itertools +PYTHON_VERSIONED_DEPENDENCIES+= setuptools_scm:build .include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/egg.mk" diff --git a/www/py-test-django/Makefile b/www/py-test-django/Makefile index e2b766b1df1..0cc3ed066f8 100644 --- a/www/py-test-django/Makefile +++ b/www/py-test-django/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2022/01/04 20:55:36 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2022/01/13 19:31:25 wiz Exp $ DISTNAME= pytest-django-3.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -11,14 +11,13 @@ HOMEPAGE= https://pytest-django.readthedocs.io/ COMMENT= Django plugin for pytest LICENSE= modified-bsd -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.11.1:../../devel/py-setuptools_scm - .include "../../lang/python/pyversion.mk" .if ${_PYTHON_VERSION} == 27 DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2 .endif PYTHON_VERSIONED_DEPENDENCIES= test +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build USE_LANGUAGES= # none diff --git a/x11/py-Xlib/Makefile b/x11/py-Xlib/Makefile index 705ff9867a1..cdae0f05b33 100644 --- a/x11/py-Xlib/Makefile +++ b/x11/py-Xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2022/01/04 20:55:40 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2022/01/13 19:31:25 wiz Exp $ DISTNAME= python-xlib-0.29 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-x/X/} @@ -16,8 +16,10 @@ LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= # none -DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six +PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" |