*: convert pip users to lang/python/versioned_dependencies.mk

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: *: convert pip users to lang/python/versioned_dependencies.mk
From: Thomas Klausner <tk%giga.or.at@localhost>
Date: Tue, 09 Nov 2021 23:18:22 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Nov 10 00:18:22 2021 +0100
Changeset:	5b92dd14d9592c3784bdf52abba596a78806fadb

Modified Files:
	py-buildbot-www/Makefile
	py-checkov/Makefile
	py-napalm-base/Makefile
	py-pandoc/Makefile
	py-pipdeptree/Makefile
	py-pipenv/Makefile
	py-pwntools/Makefile
	py-test-doctestplus/Makefile

Log Message:
*: convert pip users to lang/python/versioned_dependencies.mk

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5b92dd14d9592c3784bdf52abba596a78806fadb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-buildbot-www/Makefile     | 4 +++-
 py-checkov/Makefile          | 3 +--
 py-napalm-base/Makefile      | 4 +++-
 py-pandoc/Makefile           | 4 +++-
 py-pipdeptree/Makefile       | 5 +++--
 py-pipenv/Makefile           | 3 ++-
 py-pwntools/Makefile         | 3 +--
 py-test-doctestplus/Makefile | 6 +++---
 8 files changed, 19 insertions(+), 13 deletions(-)

diffs:
diff --git a/py-buildbot-www/Makefile b/py-buildbot-www/Makefile
index 1101c9d86b..c662e3c53f 100644
--- a/py-buildbot-www/Makefile
+++ b/py-buildbot-www/Makefile
@@ -9,10 +9,12 @@ COMMENT=	Web frontend for the buildbot CI system
 DEPENDS+=	${PYPKGPREFIX}-buildbot-[0-9]*:../../wip/py-buildbot
 BUILD_DEPENDS+=	${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
 BUILD_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-BUILD_DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 BUILD_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 BUILD_DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pip:build
+
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../wip/py-buildbot/Makefile.common"
diff --git a/py-checkov/Makefile b/py-checkov/Makefile
index 78919b0aae..5251f1c2a4 100644
--- a/py-checkov/Makefile
+++ b/py-checkov/Makefile
@@ -14,7 +14,6 @@ LICENSE=	apache-2.0
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test>=5.3.1:../../devel/py-test
 BUILD_DEPENDS+=	${PYPKGPREFIX}-coverage>=5.3.1:../../devel/py-coverage
 BUILD_DEPENDS+=	${PYPKGPREFIX}-coverage-badge>=1.0.1:../../wip/py-coverage-badge
-BUILD_DEPENDS+=	${PYPKGPREFIX}-pipenv-setup>=3.1.1:../../wip/py-pipenv-setup
 BUILD_DEPENDS+=	${PYPKGPREFIX}-bandit>=1.7.0:../../wip/py-bandit
 DEPENDS+=	${PYPKGPREFIX}-bc-python-hcl2>=0.3.12:../../wip/py-bc-python-hcl2
 DEPENDS+=	${PYPKGPREFIX}-deep-merge>=0.0.4:../../wip/py-deep-merge
@@ -32,7 +31,7 @@ DEPENDS+=	${PYPKGPREFIX}-tqdm>=4.49.0:../../misc/py-tqdm
 DEPENDS+=	${PYPKGPREFIX}-update-checker-[0-9]*:../../wip/py-update-checker
 DEPENDS+=	${PYPKGPREFIX}-semantic_version>=2.8.5:../../devel/py-semantic_version
 
-PYTHON_VERSIONED_DEPENDENCIES+=	packaging
+PYTHON_VERSIONED_DEPENDENCIES+=	packaging pip:build
 
 post-extract:
 	${MV} ${WRKSRC}/bin/checkov ${WRKSRC}/bin/checkov${PYVERSSUFFIX}
diff --git a/py-napalm-base/Makefile b/py-napalm-base/Makefile
index 432d2e0bfb..9b28f53457 100644
--- a/py-napalm-base/Makefile
+++ b/py-napalm-base/Makefile
@@ -15,11 +15,13 @@ DEPENDS+=	${PYPKGPREFIX}-jtextfsm-[0-9]*:../../wip/py-jtextfsm
 DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-netaddr-[0-9]*:../../net/py-netaddr
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
+
+PYTHON_VERSIONED_DEPENDENCIES+=	pip
 
 # Mistakenly installed, prone to name conflicts (e.g. with napalm-iosxr)
 post-install:
 	rm -f ${DESTDIR}/${PREFIX}/${PYSITELIB}/test/__init__.*
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pandoc/Makefile b/py-pandoc/Makefile
index a43551ce7a..264722221f 100644
--- a/py-pandoc/Makefile
+++ b/py-pandoc/Makefile
@@ -10,10 +10,12 @@ HOMEPAGE=	https://github.com/bebraw/pypandoc
 COMMENT=	Thin wrapper for pandoc
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pip>=8.1.0:../../devel/py-pip
 DEPENDS+=	${PYPKGPREFIX}-wheel>=0.25.0:../../devel/py-wheel
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pip
+
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pipdeptree/Makefile b/py-pipdeptree/Makefile
index 08e1867882..6266ecccb9 100644
--- a/py-pipdeptree/Makefile
+++ b/py-pipdeptree/Makefile
@@ -12,10 +12,11 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pip
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} pipdeptree pipdeptree-${PYVERSSUFFIX}
 
-DEPENDS+=       ${PYPKGPREFIX}-pip>=6.0.0:../../devel/py-pip
-
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pipenv/Makefile b/py-pipenv/Makefile
index 1a7f14b175..e40b616131 100644
--- a/py-pipenv/Makefile
+++ b/py-pipenv/Makefile
@@ -18,11 +18,12 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-flake8>=3.3.0:../../devel/py-flake8
 BUILD_DEPENDS+=	${PYPKGPREFIX}-black>=20.8:../../textproc/py-black
 BUILD_DEPENDS+=	${PYPKGPREFIX}-parver>=0.3.1:../../wip/py-parver
 BUILD_DEPENDS+=	${PYPKGPREFIX}-invoke>=1.4.1:../../wip/py-invoke
-DEPENDS+=	${PYPKGPREFIX}-pip>=18.0:../../devel/py-pip
 DEPENDS+=	${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
 DEPENDS+=	${PYPKGPREFIX}-virtualenv-clone>=0.2.5:../../wip/py-virtualenv-clone
 DEPENDS+=	${PYPKGPREFIX}-virtualenv>=0:../../devel/py-virtualenv
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pip
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pwntools/Makefile b/py-pwntools/Makefile
index 9014957442..b3d80a6047 100644
--- a/py-pwntools/Makefile
+++ b/py-pwntools/Makefile
@@ -17,7 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-intervaltree>=3.0:../../devel/py-intervaltree
 DEPENDS+=	${PYPKGPREFIX}-mako>=1.0.0:../../devel/py-mako
 DEPENDS+=	${PYPKGPREFIX}-paramiko>=1.15.2:../../security/py-paramiko
-DEPENDS+=	${PYPKGPREFIX}-pip>=6.0.8:../../devel/py-pip
 DEPENDS+=	${PYPKGPREFIX}-psutil>=3.3.0:../../sysutils/py-psutil
 DEPENDS+=	${PYPKGPREFIX}-pyelftools>=0.2.4:../../devel/py-pyelftools
 DEPENDS+=	${PYPKGPREFIX}-pygments>=2.0:../../textproc/py-pygments
@@ -29,7 +28,7 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.12.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers-[0-9]*:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-unicorn>=1.0.2:../../emulators/py-unicorn
 
-PYTHON_VERSIONED_DEPENDENCIES+=	packaging
+PYTHON_VERSIONED_DEPENDENCIES+=	packaging pip
 
 post-install:
 .for f in asm checksec common constgrep cyclic debug disablenx disasm elfdiff \
diff --git a/py-test-doctestplus/Makefile b/py-test-doctestplus/Makefile
index e32dd1dc0f..5b72a95d7e 100644
--- a/py-test-doctestplus/Makefile
+++ b/py-test-doctestplus/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE=	https://astropy.org/
 COMMENT=	Pytest plugin with advanced doctest features
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-pip>=20.2.3:../../devel/py-pip
-DEPENDS+=	${PYPKGPREFIX}-test>=6.0.2:../../devel/py-test
-
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pip test
+
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Prev by Date: py-pip-audit: add an upstream patch
Next by Date: py-pip-audit: update to 0.0.5
Previous by Thread: py-pip-audit: add an upstream patch
Next by Thread: py-pip-audit: update to 0.0.5
Indexes:
Home | Main Index | Thread Index | Old Index