pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: setuptools_scm: switch to versioned_dependencies
details: https://anonhg.NetBSD.org/pkgsrc/rev/59b579674676
branches: trunk
changeset: 371753:59b579674676
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Jan 13 19:31:20 2022 +0000
description:
*: setuptools_scm: switch to versioned_dependencies
diffstat:
archivers/py-zipp1/Makefile | 5 +++--
archivers/py-zopfli/Makefile | 5 +++--
devel/py-apipkg/Makefile | 5 +++--
devel/py-automat/Makefile | 6 ++++--
devel/py-backports.functools_lru_cache/Makefile | 4 ++--
devel/py-backports.os/Makefile | 4 ++--
devel/py-configparser/Makefile | 4 ++--
devel/py-execnet/Makefile | 6 ++++--
devel/py-filelock/Makefile | 6 ++++--
devel/py-hgtools/Makefile | 5 +++--
devel/py-hyperscan/Makefile | 6 ++++--
devel/py-importlib-metadata/Makefile | 5 ++---
devel/py-importlib-resources/Makefile | 6 +++---
devel/py-iniconfig/Makefile | 5 +++--
devel/py-jaraco.functools/Makefile | 6 ++----
devel/py-path.py/Makefile | 5 ++---
devel/py-pluggy/Makefile | 6 ++----
devel/py-plumbum/Makefile | 5 ++---
devel/py-py/Makefile | 5 +++--
devel/py-setuptools_scm_git_archive/Makefile | 5 +++--
devel/py-singledispatch/Makefile | 4 ++--
devel/py-test-forked/Makefile | 6 ++----
devel/py-test-runner/Makefile | 5 ++---
devel/py-test-xdist/Makefile | 5 ++---
devel/py-test4/Makefile | 4 ++--
devel/py-tox/Makefile | 4 ++--
devel/py-visitor/Makefile | 3 +--
lang/py-asttokens/Makefile | 5 ++---
lang/py-inflect/Makefile | 5 +++--
lang/python/versioned_dependencies.mk | 5 +++--
math/py-mpmath/Makefile | 6 ++++--
net/py-portend/Makefile | 5 ++---
security/py-acme-tiny/Makefile | 6 ++++--
security/py-keyrings.alt/Makefile | 6 ++++--
security/py-signedjson/Makefile | 6 ++++--
sysutils/py-salt-pepper/Makefile | 7 ++++---
textproc/py-black/Makefile | 7 ++++++-
textproc/py-jsonpickle/Makefile | 6 ++++--
textproc/py-jsonschema/Makefile | 6 ++++--
time/py-dateutil/Makefile | 4 ++--
time/py-tempora/Makefile | 4 ++--
www/py-cheroot/Makefile | 4 ++--
www/py-test-django/Makefile | 5 ++---
x11/py-Xlib/Makefile | 6 ++++--
44 files changed, 125 insertions(+), 103 deletions(-)
diffs (truncated from 1056 to 300 lines):
diff -r 262bbc065407 -r 59b579674676 archivers/py-zipp1/Makefile
--- a/archivers/py-zipp1/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/archivers/py-zipp1/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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}-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 -r 262bbc065407 -r 59b579674676 archivers/py-zopfli/Makefile
--- a/archivers/py-zopfli/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/archivers/py-zopfli/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-apipkg/Makefile
--- a/devel/py-apipkg/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-apipkg/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-automat/Makefile
--- a/devel/py-automat/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-automat/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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_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 -r 262bbc065407 -r 59b579674676 devel/py-backports.functools_lru_cache/Makefile
--- a/devel/py-backports.functools_lru_cache/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-backports.functools_lru_cache/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-backports.os/Makefile
--- a/devel/py-backports.os/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-backports.os/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-configparser/Makefile
--- a/devel/py-configparser/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-configparser/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-execnet/Makefile
--- a/devel/py-execnet/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-execnet/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-filelock/Makefile
--- a/devel/py-filelock/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-filelock/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-hgtools/Makefile
--- a/devel/py-hgtools/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-hgtools/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-hyperscan/Makefile
--- a/devel/py-hyperscan/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-hyperscan/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-importlib-metadata/Makefile
--- a/devel/py-importlib-metadata/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-importlib-metadata/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 @@
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 -r 262bbc065407 -r 59b579674676 devel/py-importlib-resources/Makefile
--- a/devel/py-importlib-resources/Makefile Thu Jan 13 19:14:05 2022 +0000
+++ b/devel/py-importlib-resources/Makefile Thu Jan 13 19:31:20 2022 +0000
@@ -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 @@
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 @@
.endif
.if ${_PYTHON_VERSION} < 38
PYTHON_VERSIONED_DEPENDENCIES+= zipp
-.include "../../lang/python/versioned_dependencies.mk"
.endif
+PYTHON_VERSIONED_DEPENDENCIES+= setuptools_scm
USE_LANGUAGES= # none
Home |
Main Index |
Thread Index |
Old Index