pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Thu Jan 13 19:31:25 UTC 2022
Modified Files:
pkgsrc/archivers/py-zipp1: Makefile
pkgsrc/archivers/py-zopfli: Makefile
pkgsrc/devel/py-apipkg: Makefile
pkgsrc/devel/py-automat: Makefile
pkgsrc/devel/py-backports.functools_lru_cache: Makefile
pkgsrc/devel/py-backports.os: Makefile
pkgsrc/devel/py-configparser: Makefile
pkgsrc/devel/py-execnet: Makefile
pkgsrc/devel/py-filelock: Makefile
pkgsrc/devel/py-hgtools: Makefile
pkgsrc/devel/py-hyperscan: Makefile
pkgsrc/devel/py-importlib-metadata: Makefile
pkgsrc/devel/py-importlib-resources: Makefile
pkgsrc/devel/py-iniconfig: Makefile
pkgsrc/devel/py-jaraco.functools: Makefile
pkgsrc/devel/py-path.py: Makefile
pkgsrc/devel/py-pluggy: Makefile
pkgsrc/devel/py-plumbum: Makefile
pkgsrc/devel/py-py: Makefile
pkgsrc/devel/py-setuptools_scm_git_archive: Makefile
pkgsrc/devel/py-singledispatch: Makefile
pkgsrc/devel/py-test-forked: Makefile
pkgsrc/devel/py-test-runner: Makefile
pkgsrc/devel/py-test-xdist: Makefile
pkgsrc/devel/py-test4: Makefile
pkgsrc/devel/py-tox: Makefile
pkgsrc/devel/py-visitor: Makefile
pkgsrc/lang/py-asttokens: Makefile
pkgsrc/lang/py-inflect: Makefile
pkgsrc/lang/python: versioned_dependencies.mk
pkgsrc/math/py-mpmath: Makefile
pkgsrc/net/py-portend: Makefile
pkgsrc/security/py-acme-tiny: Makefile
pkgsrc/security/py-keyrings.alt: Makefile
pkgsrc/security/py-signedjson: Makefile
pkgsrc/sysutils/py-salt-pepper: Makefile
pkgsrc/textproc/py-black: Makefile
pkgsrc/textproc/py-jsonpickle: Makefile
pkgsrc/textproc/py-jsonschema: Makefile
pkgsrc/time/py-dateutil: Makefile
pkgsrc/time/py-tempora: Makefile
pkgsrc/www/py-cheroot: Makefile
pkgsrc/www/py-test-django: Makefile
pkgsrc/x11/py-Xlib: Makefile
Log Message:
*: setuptools_scm: switch to versioned_dependencies
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/archivers/py-zipp1/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/py-zopfli/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-apipkg/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-automat/Makefile
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/devel/py-backports.functools_lru_cache/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-backports.os/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-configparser/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-execnet/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-filelock/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-hgtools/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-hyperscan/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-importlib-metadata/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-importlib-resources/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-iniconfig/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-jaraco.functools/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-path.py/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/py-pluggy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-plumbum/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-py/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-setuptools_scm_git_archive/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-singledispatch/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-test-forked/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-test-runner/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/py-test-xdist/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-test4/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/py-tox/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-visitor/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/py-asttokens/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/py-inflect/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/python/versioned_dependencies.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/py-mpmath/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-portend/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/py-acme-tiny/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-keyrings.alt/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-signedjson/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/py-salt-pepper/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-black/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-jsonpickle/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/py-jsonschema/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/time/py-dateutil/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/time/py-tempora/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/py-cheroot/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-test-django/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/py-Xlib/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-zipp1/Makefile
diff -u pkgsrc/archivers/py-zipp1/Makefile:1.5 pkgsrc/archivers/py-zipp1/Makefile:1.6
--- pkgsrc/archivers/py-zipp1/Makefile:1.5 Tue Jan 4 20:52:31 2022
+++ pkgsrc/archivers/py-zipp1/Makefile Thu Jan 13 19:31:20 2022
@@ -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-
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"
Index: pkgsrc/archivers/py-zopfli/Makefile
diff -u pkgsrc/archivers/py-zopfli/Makefile:1.2 pkgsrc/archivers/py-zopfli/Makefile:1.3
--- pkgsrc/archivers/py-zopfli/Makefile:1.2 Tue Jan 4 20:52:31 2022
+++ pkgsrc/archivers/py-zopfli/Makefile Thu Jan 13 19:31:20 2022
@@ -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/p
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"
Index: pkgsrc/devel/py-apipkg/Makefile
diff -u pkgsrc/devel/py-apipkg/Makefile:1.4 pkgsrc/devel/py-apipkg/Makefile:1.5
--- pkgsrc/devel/py-apipkg/Makefile:1.4 Tue Jan 4 20:52:49 2022
+++ pkgsrc/devel/py-apipkg/Makefile Thu Jan 13 19:31:21 2022
@@ -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/
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"
Index: pkgsrc/devel/py-automat/Makefile
diff -u pkgsrc/devel/py-automat/Makefile:1.6 pkgsrc/devel/py-automat/Makefile:1.7
--- pkgsrc/devel/py-automat/Makefile:1.6 Wed Jan 5 15:41:01 2022
+++ pkgsrc/devel/py-automat/Makefile Thu Jan 13 19:31:21 2022
@@ -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 machi
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"
Index: pkgsrc/devel/py-backports.functools_lru_cache/Makefile
diff -u pkgsrc/devel/py-backports.functools_lru_cache/Makefile:1.10 pkgsrc/devel/py-backports.functools_lru_cache/Makefile:1.11
--- pkgsrc/devel/py-backports.functools_lru_cache/Makefile:1.10 Tue Jan 4 20:52:51 2022
+++ pkgsrc/devel/py-backports.functools_lru_cache/Makefile Thu Jan 13 19:31:21 2022
@@ -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
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
Index: pkgsrc/devel/py-backports.os/Makefile
diff -u pkgsrc/devel/py-backports.os/Makefile:1.2 pkgsrc/devel/py-backports.os/Makefile:1.3
--- pkgsrc/devel/py-backports.os/Makefile:1.2 Tue Jan 4 20:52:52 2022
+++ pkgsrc/devel/py-backports.os/Makefile Thu Jan 13 19:31:23 2022
@@ -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
Index: pkgsrc/devel/py-configparser/Makefile
diff -u pkgsrc/devel/py-configparser/Makefile:1.12 pkgsrc/devel/py-configparser/Makefile:1.13
--- pkgsrc/devel/py-configparser/Makefile:1.12 Tue Jan 4 20:52:57 2022
+++ pkgsrc/devel/py-configparser/Makefile Thu Jan 13 19:31:21 2022
@@ -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/conf
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
Index: pkgsrc/devel/py-execnet/Makefile
diff -u pkgsrc/devel/py-execnet/Makefile:1.10 pkgsrc/devel/py-execnet/Makefile:1.11
--- pkgsrc/devel/py-execnet/Makefile:1.10 Tue Jan 4 20:53:02 2022
+++ pkgsrc/devel/py-execnet/Makefile Thu Jan 13 19:31:21 2022
@@ -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"
Index: pkgsrc/devel/py-filelock/Makefile
diff -u pkgsrc/devel/py-filelock/Makefile:1.5 pkgsrc/devel/py-filelock/Makefile:1.6
--- pkgsrc/devel/py-filelock/Makefile:1.5 Mon Jan 10 11:29:24 2022
+++ pkgsrc/devel/py-filelock/Makefile Thu Jan 13 19:31:23 2022
@@ -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-
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"
Index: pkgsrc/devel/py-hgtools/Makefile
diff -u pkgsrc/devel/py-hgtools/Makefile:1.7 pkgsrc/devel/py-hgtools/Makefile:1.8
--- pkgsrc/devel/py-hgtools/Makefile:1.7 Tue Jan 4 20:53:10 2022
+++ pkgsrc/devel/py-hgtools/Makefile Thu Jan 13 19:31:21 2022
@@ -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/hgto
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"
Index: pkgsrc/devel/py-hyperscan/Makefile
diff -u pkgsrc/devel/py-hyperscan/Makefile:1.6 pkgsrc/devel/py-hyperscan/Makefile:1.7
--- pkgsrc/devel/py-hyperscan/Makefile:1.6 Tue Jan 4 20:53:10 2022
+++ pkgsrc/devel/py-hyperscan/Makefile Thu Jan 13 19:31:23 2022
@@ -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"
Index: pkgsrc/devel/py-importlib-metadata/Makefile
diff -u pkgsrc/devel/py-importlib-metadata/Makefile:1.23 pkgsrc/devel/py-importlib-metadata/Makefile:1.24
--- pkgsrc/devel/py-importlib-metadata/Makefile:1.23 Tue Jan 4 20:53:10 2022
+++ pkgsrc/devel/py-importlib-metadata/Makefile Thu Jan 13 19:31:23 2022
@@ -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.rea
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]*
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
Index: pkgsrc/devel/py-importlib-resources/Makefile
diff -u pkgsrc/devel/py-importlib-resources/Makefile:1.9 pkgsrc/devel/py-importlib-resources/Makefile:1.10
--- pkgsrc/devel/py-importlib-resources/Makefile:1.9 Tue Jan 4 20:53:10 2022
+++ pkgsrc/devel/py-importlib-resources/Makefile Thu Jan 13 19:31:23 2022
@@ -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.re
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]*:.
.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"
Index: pkgsrc/devel/py-iniconfig/Makefile
diff -u pkgsrc/devel/py-iniconfig/Makefile:1.3 pkgsrc/devel/py-iniconfig/Makefile:1.4
--- pkgsrc/devel/py-iniconfig/Makefile:1.3 Tue Jan 4 20:53:11 2022
+++ pkgsrc/devel/py-iniconfig/Makefile Thu Jan 13 19:31:23 2022
@@ -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/RonnyPfanns
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"
Index: pkgsrc/devel/py-jaraco.functools/Makefile
diff -u pkgsrc/devel/py-jaraco.functools/Makefile:1.5 pkgsrc/devel/py-jaraco.functools/Makefile:1.6
--- pkgsrc/devel/py-jaraco.functools/Makefile:1.5 Tue Jan 4 20:53:12 2022
+++ pkgsrc/devel/py-jaraco.functools/Makefile Thu Jan 13 19:31:23 2022
@@ -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/jara
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.funct
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"
Index: pkgsrc/devel/py-path.py/Makefile
diff -u pkgsrc/devel/py-path.py/Makefile:1.10 pkgsrc/devel/py-path.py/Makefile:1.11
--- pkgsrc/devel/py-path.py/Makefile:1.10 Tue Jan 4 20:53:20 2022
+++ pkgsrc/devel/py-path.py/Makefile Thu Jan 13 19:31:22 2022
@@ -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
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
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
Index: pkgsrc/devel/py-pluggy/Makefile
diff -u pkgsrc/devel/py-pluggy/Makefile:1.17 pkgsrc/devel/py-pluggy/Makefile:1.18
--- pkgsrc/devel/py-pluggy/Makefile:1.17 Tue Jan 4 20:53:21 2022
+++ pkgsrc/devel/py-pluggy/Makefile Thu Jan 13 19:31:22 2022
@@ -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/
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
Index: pkgsrc/devel/py-plumbum/Makefile
diff -u pkgsrc/devel/py-plumbum/Makefile:1.6 pkgsrc/devel/py-plumbum/Makefile:1.7
--- pkgsrc/devel/py-plumbum/Makefile:1.6 Tue Jan 4 20:53:21 2022
+++ pkgsrc/devel/py-plumbum/Makefile Thu Jan 13 19:31:23 2022
@@ -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-timeo
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
Index: pkgsrc/devel/py-py/Makefile
diff -u pkgsrc/devel/py-py/Makefile:1.22 pkgsrc/devel/py-py/Makefile:1.23
--- pkgsrc/devel/py-py/Makefile:1.22 Tue Jan 4 20:53:22 2022
+++ pkgsrc/devel/py-py/Makefile Thu Jan 13 19:31:22 2022
@@ -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"
Index: pkgsrc/devel/py-setuptools_scm_git_archive/Makefile
diff -u pkgsrc/devel/py-setuptools_scm_git_archive/Makefile:1.3 pkgsrc/devel/py-setuptools_scm_git_archive/Makefile:1.4
--- pkgsrc/devel/py-setuptools_scm_git_archive/Makefile:1.3 Tue Jan 4 20:53:38 2022
+++ pkgsrc/devel/py-setuptools_scm_git_archive/Makefile Thu Jan 13 19:31:24 2022
@@ -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/se
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"
Index: pkgsrc/devel/py-singledispatch/Makefile
diff -u pkgsrc/devel/py-singledispatch/Makefile:1.6 pkgsrc/devel/py-singledispatch/Makefile:1.7
--- pkgsrc/devel/py-singledispatch/Makefile:1.6 Tue Jan 4 20:53:39 2022
+++ pkgsrc/devel/py-singledispatch/Makefile Thu Jan 13 19:31:22 2022
@@ -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/s
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
Index: pkgsrc/devel/py-test-forked/Makefile
diff -u pkgsrc/devel/py-test-forked/Makefile:1.8 pkgsrc/devel/py-test-forked/Makefile:1.9
--- pkgsrc/devel/py-test-forked/Makefile:1.8 Tue Jan 4 20:53:41 2022
+++ pkgsrc/devel/py-test-forked/Makefile Thu Jan 13 19:31:22 2022
@@ -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/
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
Index: pkgsrc/devel/py-test-runner/Makefile
diff -u pkgsrc/devel/py-test-runner/Makefile:1.21 pkgsrc/devel/py-test-runner/Makefile:1.22
--- pkgsrc/devel/py-test-runner/Makefile:1.21 Tue Jan 4 20:53:42 2022
+++ pkgsrc/devel/py-test-runner/Makefile Thu Jan 13 19:31:22 2022
@@ -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/
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}
Index: pkgsrc/devel/py-test-xdist/Makefile
diff -u pkgsrc/devel/py-test-xdist/Makefile:1.30 pkgsrc/devel/py-test-xdist/Makefile:1.31
--- pkgsrc/devel/py-test-xdist/Makefile:1.30 Tue Jan 4 20:53:43 2022
+++ pkgsrc/devel/py-test-xdist/Makefile Thu Jan 13 19:31:22 2022
@@ -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
Index: pkgsrc/devel/py-test4/Makefile
diff -u pkgsrc/devel/py-test4/Makefile:1.5 pkgsrc/devel/py-test4/Makefile:1.6
--- pkgsrc/devel/py-test4/Makefile:1.5 Wed Jan 5 20:47:36 2022
+++ pkgsrc/devel/py-test4/Makefile Thu Jan 13 19:31:23 2022
@@ -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:..
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-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
Index: pkgsrc/devel/py-tox/Makefile
diff -u pkgsrc/devel/py-tox/Makefile:1.24 pkgsrc/devel/py-tox/Makefile:1.25
--- pkgsrc/devel/py-tox/Makefile:1.24 Wed Jan 5 15:41:08 2022
+++ pkgsrc/devel/py-tox/Makefile Thu Jan 13 19:31:22 2022
@@ -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-metad
PYTHON_VERSIONED_DEPENDENCIES+= packaging
PYTHON_VERSIONED_DEPENDENCIES+= test:test
+PYTHON_VERSIONED_DEPENDENCIES+= setuptools_scm:build
USE_PKG_RESOURCES= yes
Index: pkgsrc/devel/py-visitor/Makefile
diff -u pkgsrc/devel/py-visitor/Makefile:1.3 pkgsrc/devel/py-visitor/Makefile:1.4
--- pkgsrc/devel/py-visitor/Makefile:1.3 Tue Jan 4 20:53:47 2022
+++ pkgsrc/devel/py-visitor/Makefile Thu Jan 13 19:31:22 2022
@@ -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 implement
LICENSE= mit
#DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-#BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
USE_LANGUAGES= # none
Index: pkgsrc/lang/py-asttokens/Makefile
diff -u pkgsrc/lang/py-asttokens/Makefile:1.17 pkgsrc/lang/py-asttokens/Makefile:1.18
--- pkgsrc/lang/py-asttokens/Makefile:1.17 Tue Jan 4 20:54:08 2022
+++ pkgsrc/lang/py-asttokens/Makefile Thu Jan 13 19:31:24 2022
@@ -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/a
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
Index: pkgsrc/lang/py-inflect/Makefile
diff -u pkgsrc/lang/py-inflect/Makefile:1.2 pkgsrc/lang/py-inflect/Makefile:1.3
--- pkgsrc/lang/py-inflect/Makefile:1.2 Tue Jan 4 20:54:08 2022
+++ pkgsrc/lang/py-inflect/Makefile Thu Jan 13 19:31:24 2022
@@ -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/in
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-metad
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/python/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.57 pkgsrc/lang/python/versioned_dependencies.mk:1.58
--- pkgsrc/lang/python/versioned_dependencies.mk:1.57 Fri Dec 31 13:25:18 2021
+++ pkgsrc/lang/python/versioned_dependencies.mk Thu Jan 13 19:31:25 2022
@@ -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
_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
Index: pkgsrc/math/py-mpmath/Makefile
diff -u pkgsrc/math/py-mpmath/Makefile:1.17 pkgsrc/math/py-mpmath/Makefile:1.18
--- pkgsrc/math/py-mpmath/Makefile:1.17 Tue Jan 4 20:54:14 2022
+++ pkgsrc/math/py-mpmath/Makefile Thu Jan 13 19:31:24 2022
@@ -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"
Index: pkgsrc/net/py-portend/Makefile
diff -u pkgsrc/net/py-portend/Makefile:1.8 pkgsrc/net/py-portend/Makefile:1.9
--- pkgsrc/net/py-portend/Makefile:1.8 Tue Jan 4 20:54:30 2022
+++ pkgsrc/net/py-portend/Makefile Thu Jan 13 19:31:21 2022
@@ -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
Index: pkgsrc/security/py-acme-tiny/Makefile
diff -u pkgsrc/security/py-acme-tiny/Makefile:1.10 pkgsrc/security/py-acme-tiny/Makefile:1.11
--- pkgsrc/security/py-acme-tiny/Makefile:1.10 Wed Jan 5 15:41:19 2022
+++ pkgsrc/security/py-acme-tiny/Makefile Thu Jan 13 19:31:24 2022
@@ -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/acm
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"
Index: pkgsrc/security/py-keyrings.alt/Makefile
diff -u pkgsrc/security/py-keyrings.alt/Makefile:1.3 pkgsrc/security/py-keyrings.alt/Makefile:1.4
--- pkgsrc/security/py-keyrings.alt/Makefile:1.3 Tue Jan 4 20:54:42 2022
+++ pkgsrc/security/py-keyrings.alt/Makefile Thu Jan 13 19:31:24 2022
@@ -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/keyr
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"
Index: pkgsrc/security/py-signedjson/Makefile
diff -u pkgsrc/security/py-signedjson/Makefile:1.3 pkgsrc/security/py-signedjson/Makefile:1.4
--- pkgsrc/security/py-signedjson/Makefile:1.3 Sat Jan 8 16:14:31 2022
+++ pkgsrc/security/py-signedjson/Makefile Thu Jan 13 19:31:24 2022
@@ -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>
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"
Index: pkgsrc/sysutils/py-salt-pepper/Makefile
diff -u pkgsrc/sysutils/py-salt-pepper/Makefile:1.4 pkgsrc/sysutils/py-salt-pepper/Makefile:1.5
--- pkgsrc/sysutils/py-salt-pepper/Makefile:1.4 Wed Jan 5 15:41:22 2022
+++ pkgsrc/sysutils/py-salt-pepper/Makefile Thu Jan 13 19:31:24 2022
@@ -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/p
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"
Index: pkgsrc/textproc/py-black/Makefile
diff -u pkgsrc/textproc/py-black/Makefile:1.4 pkgsrc/textproc/py-black/Makefile:1.5
--- pkgsrc/textproc/py-black/Makefile:1.4 Tue Jan 11 09:13:29 2022
+++ pkgsrc/textproc/py-black/Makefile Thu Jan 13 19:31:25 2022
@@ -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:..
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"
Index: pkgsrc/textproc/py-jsonpickle/Makefile
diff -u pkgsrc/textproc/py-jsonpickle/Makefile:1.10 pkgsrc/textproc/py-jsonpickle/Makefile:1.11
--- pkgsrc/textproc/py-jsonpickle/Makefile:1.10 Tue Jan 4 20:54:57 2022
+++ pkgsrc/textproc/py-jsonpickle/Makefile Thu Jan 13 19:31:25 2022
@@ -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-metad
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"
Index: pkgsrc/textproc/py-jsonschema/Makefile
diff -u pkgsrc/textproc/py-jsonschema/Makefile:1.18 pkgsrc/textproc/py-jsonschema/Makefile:1.19
--- pkgsrc/textproc/py-jsonschema/Makefile:1.18 Wed Jan 5 15:41:25 2022
+++ pkgsrc/textproc/py-jsonschema/Makefile Thu Jan 13 19:31:25 2022
@@ -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/json
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-metad
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"
Index: pkgsrc/time/py-dateutil/Makefile
diff -u pkgsrc/time/py-dateutil/Makefile:1.31 pkgsrc/time/py-dateutil/Makefile:1.32
--- pkgsrc/time/py-dateutil/Makefile:1.31 Tue Jan 4 20:55:11 2022
+++ pkgsrc/time/py-dateutil/Makefile Thu Jan 13 19:31:24 2022
@@ -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 date
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}
Index: pkgsrc/time/py-tempora/Makefile
diff -u pkgsrc/time/py-tempora/Makefile:1.14 pkgsrc/time/py-tempora/Makefile:1.15
--- pkgsrc/time/py-tempora/Makefile:1.14 Wed Jan 5 15:41:28 2022
+++ pkgsrc/time/py-tempora/Makefile Thu Jan 13 19:31:25 2022
@@ -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
Index: pkgsrc/www/py-cheroot/Makefile
diff -u pkgsrc/www/py-cheroot/Makefile:1.29 pkgsrc/www/py-cheroot/Makefile:1.30
--- pkgsrc/www/py-cheroot/Makefile:1.29 Wed Jan 5 15:41:29 2022
+++ pkgsrc/www/py-cheroot/Makefile Thu Jan 13 19:31:25 2022
@@ -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 H
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"
Index: pkgsrc/www/py-test-django/Makefile
diff -u pkgsrc/www/py-test-django/Makefile:1.21 pkgsrc/www/py-test-django/Makefile:1.22
--- pkgsrc/www/py-test-django/Makefile:1.21 Tue Jan 4 20:55:36 2022
+++ pkgsrc/www/py-test-django/Makefile Thu Jan 13 19:31:25 2022
@@ -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.readthed
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
Index: pkgsrc/x11/py-Xlib/Makefile
diff -u pkgsrc/x11/py-Xlib/Makefile:1.17 pkgsrc/x11/py-Xlib/Makefile:1.18
--- pkgsrc/x11/py-Xlib/Makefile:1.17 Tue Jan 4 20:55:40 2022
+++ pkgsrc/x11/py-Xlib/Makefile Thu Jan 13 19:31:25 2022
@@ -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"
Home |
Main Index |
Thread Index |
Old Index