[pkgsrc/trunk]: pkgsrc *: convert packaging to lang/python/versioned_dependen...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc *: convert packaging to lang/python/versioned_dependen...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Tue, 09 Nov 2021 21:32:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1432edb9718a
branches:  trunk
changeset: 769226:1432edb9718a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 09 20:34:40 2021 +0000

description:
*: convert packaging to lang/python/versioned_dependencies.mk

diffstat:

 devel/py-deprecation/Makefile        |  6 ++++--
 devel/py-importlib-metadata/Makefile |  5 ++---
 devel/py-path.py/Makefile            |  5 ++---
 devel/py-test4/Makefile              |  4 ++--
 devel/py-tox/Makefile                |  4 ++--
 sysutils/ansible-base/Makefile       |  6 ++++--
 textproc/py-sphinx1/Makefile         |  5 ++---
 www/py-bleach/Makefile               |  6 ++++--
 www/py-flask-cors/Makefile           |  6 ++++--
 9 files changed, 26 insertions(+), 21 deletions(-)

diffs (231 lines):

diff -r ca4176c83fe6 -r 1432edb9718a devel/py-deprecation/Makefile
--- a/devel/py-deprecation/Makefile     Tue Nov 09 20:30:07 2021 +0000
+++ b/devel/py-deprecation/Makefile     Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/06/01 15:43:55 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/11/09 20:34:40 wiz Exp $
 
 DISTNAME=      deprecation-2.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,12 @@
 COMMENT=       Library to handle automated deprecations
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
 
+PYTHON_VERSIONED_DEPENDENCIES+=        packaging
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ca4176c83fe6 -r 1432edb9718a devel/py-importlib-metadata/Makefile
--- a/devel/py-importlib-metadata/Makefile      Tue Nov 09 20:30:07 2021 +0000
+++ b/devel/py-importlib-metadata/Makefile      Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/10/21 08:41:28 adam Exp $
+# $NetBSD: Makefile,v 1.22 2021/11/09 20:34:40 wiz Exp $
 
 DISTNAME=      importlib_metadata-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -12,7 +12,6 @@
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 TEST_DEPENDS+= ${PYPKGPREFIX}-fakefs-[0-9]*:../../devel/py-fakefs
-TEST_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 TEST_DEPENDS+= ${PYPKGPREFIX}-pep517-[0-9]*:../../devel/py-pep517
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -24,7 +23,7 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-importlib-resources>=1.3:../../devel/py-importlib-resources
 .endif
 
-PYTHON_VERSIONED_DEPENDENCIES+=        zipp
+PYTHON_VERSIONED_DEPENDENCIES+=        packaging zipp
 
 USE_LANGUAGES= # none
 
diff -r ca4176c83fe6 -r 1432edb9718a devel/py-path.py/Makefile
--- a/devel/py-path.py/Makefile Tue Nov 09 20:30:07 2021 +0000
+++ b/devel/py-path.py/Makefile Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/04/06 14:36:48 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/11/09 20:34:40 wiz Exp $
 
 DISTNAME=      path.py-11.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,14 +12,13 @@
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 TEST_DEPENDS+= ${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
-TEST_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.5:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONED_DEPENDENCIES= pygments:test
+PYTHON_VERSIONED_DEPENDENCIES= packaging:test pygments:test
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_path.py
diff -r ca4176c83fe6 -r 1432edb9718a devel/py-test4/Makefile
--- a/devel/py-test4/Makefile   Tue Nov 09 20:30:07 2021 +0000
+++ b/devel/py-test4/Makefile   Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/10/06 10:51:21 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/11/09 20:34:40 wiz Exp $
 
 DISTNAME=      pytest-4.6.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -13,7 +13,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-atomicwrites>=1.0:../../devel/py-atomicwrites
 DEPENDS+=      ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 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
@@ -35,6 +34,7 @@
 
 PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
 PYTHON_VERSIONED_DEPENDENCIES+=        hypothesis:test
+PYTHON_VERSIONED_DEPENDENCIES+=        packaging
 
 USE_LANGUAGES= # none
 USE_TOOLS+=    bash:build
diff -r ca4176c83fe6 -r 1432edb9718a devel/py-tox/Makefile
--- a/devel/py-tox/Makefile     Tue Nov 09 20:30:07 2021 +0000
+++ b/devel/py-tox/Makefile     Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/10/27 23:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.22 2021/11/09 20:34:41 wiz Exp $
 
 DISTNAME=      tox-3.20.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 DEPENDS+=      ${PYPKGPREFIX}-filelock>=3.0.0:../../devel/py-filelock
-DEPENDS+=      ${PYPKGPREFIX}-packaging>=14:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-pluggy>=0.12.0:../../devel/py-pluggy
 DEPENDS+=      ${PYPKGPREFIX}-py>=1.4.17:../../devel/py-py
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.14.0:../../lang/py-six
@@ -32,6 +31,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES+=        packaging
 PYTHON_VERSIONED_DEPENDENCIES+=        test:test
 
 USE_LANGUAGES= # none
diff -r ca4176c83fe6 -r 1432edb9718a sysutils/ansible-base/Makefile
--- a/sysutils/ansible-base/Makefile    Tue Nov 09 20:30:07 2021 +0000
+++ b/sysutils/ansible-base/Makefile    Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/10/12 09:26:10 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/11/09 20:34:41 wiz Exp $
 
 DISTNAME=      ansible-base-2.10.15
 CATEGORIES=    sysutils python
@@ -13,10 +13,11 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
-DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
+PYTHON_VERSIONED_DEPENDENCIES+=        packaging
+
 USE_TOOLS+=    gmake
 
 PKG_SYSCONFSUBDIR=     ansible
@@ -60,6 +61,7 @@
 .endfor
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ca4176c83fe6 -r 1432edb9718a textproc/py-sphinx1/Makefile
--- a/textproc/py-sphinx1/Makefile      Tue Nov 09 20:30:07 2021 +0000
+++ b/textproc/py-sphinx1/Makefile      Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/06 15:03:32 adam Exp $
+# $NetBSD: Makefile,v 1.4 2021/11/09 20:34:41 wiz Exp $
 
 DISTNAME=      Sphinx-1.8.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -16,7 +16,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-imagesize-[0-9]*:../../graphics/py-imagesize
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
-DEPENDS+=      ${PYPKGPREFIX}-packaging>=19.1nb1:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.0.0:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-snowballstemmer>=1.1:../../textproc/py-snowballstemmer
@@ -32,7 +31,7 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
-PYTHON_VERSIONED_DEPENDENCIES= pygments test:test
+PYTHON_VERSIONED_DEPENDENCIES= packaging pygments test:test
 
 USE_LANGUAGES= # none
 USE_TOOLS+=    makeinfo
diff -r ca4176c83fe6 -r 1432edb9718a www/py-bleach/Makefile
--- a/www/py-bleach/Makefile    Tue Nov 09 20:30:07 2021 +0000
+++ b/www/py-bleach/Makefile    Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/07/26 18:12:20 adam Exp $
+# $NetBSD: Makefile,v 1.23 2021/11/09 20:34:41 wiz Exp $
 
 DISTNAME=      bleach-3.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,16 +10,18 @@
 COMMENT=       Easy whitelist-based HTML-sanitizing tool
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-webencodings-[0-9]*:../../textproc/py-webencodings
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner>=2.0:../../devel/py-test-runner
 
+PYTHON_VERSIONED_DEPENDENCIES+=        packaging
+
 USE_LANGUAGES= # none
 
 REPLACE_SH+=   bleach/_vendor/pip_install_vendor.sh
 
 PYSETUPTESTTARGET=     pytest
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ca4176c83fe6 -r 1432edb9718a www/py-flask-cors/Makefile
--- a/www/py-flask-cors/Makefile        Tue Nov 09 20:30:07 2021 +0000
+++ b/www/py-flask-cors/Makefile        Tue Nov 09 20:34:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/01/06 18:53:43 kleink Exp $
+# $NetBSD: Makefile,v 1.5 2021/11/09 20:34:41 wiz Exp $
 
 DISTNAME=      Flask-Cors-3.0.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -13,9 +13,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-flask>=0.9:../../www/py-flask
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-TEST_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
+
+PYTHON_VERSIONED_DEPENDENCIES+=        packaging:test
 
 USE_LANGUAGES= # none
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/python python: add version support for py-packaging
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/py-packaging py-packaging: update to 21.2.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/python python: add version support for py-packaging
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-packaging py-packaging: update to 21.2.
Indexes:
Home | Main Index | Thread Index | Old Index