pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a444ff5ca71b
branches:  trunk
changeset: 769238:a444ff5ca71b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 09 23:18:57 2021 +0000

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

diffstat:

 devel/py-cpplint/Makefile        |  5 ++---
 devel/py-setuptools_scm/Makefile |  5 ++---
 lang/py-asttokens/Makefile       |  6 ++++--
 net/py-pypiserver/Makefile       |  7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diffs (100 lines):

diff -r a2133891f233 -r a444ff5ca71b devel/py-cpplint/Makefile
--- a/devel/py-cpplint/Makefile Tue Nov 09 23:13:36 2021 +0000
+++ b/devel/py-cpplint/Makefile Tue Nov 09 23:18:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/11/01 18:58:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2021/11/09 23:18:57 wiz Exp $
 
 DISTNAME=      cpplint-1.5.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,8 @@
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-testfixtures-[0-9]*:../../devel/py-testfixtures
-TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test zipp:test pyparsing:test
+PYTHON_VERSIONED_DEPENDENCIES= pip:tool test:test zipp:test pyparsing:test
 
 .include "../../lang/python/pyversion.mk"
 
diff -r a2133891f233 -r a444ff5ca71b devel/py-setuptools_scm/Makefile
--- a/devel/py-setuptools_scm/Makefile  Tue Nov 09 23:13:36 2021 +0000
+++ b/devel/py-setuptools_scm/Makefile  Tue Nov 09 23:18:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/03/05 07:55:44 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/11/09 23:18:57 wiz Exp $
 
 DISTNAME=      setuptools_scm-5.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,10 +11,9 @@
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
-TEST_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 TEST_DEPENDS+= ${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= pip:test test:test
 
 USE_LANGUAGES= # none
 
diff -r a2133891f233 -r a444ff5ca71b lang/py-asttokens/Makefile
--- a/lang/py-asttokens/Makefile        Tue Nov 09 23:13:36 2021 +0000
+++ b/lang/py-asttokens/Makefile        Tue Nov 09 23:18:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/05/04 09:21:21 adam Exp $
+# $NetBSD: Makefile,v 1.16 2021/11/09 23:18:58 wiz Exp $
 
 DISTNAME=      asttokens-2.0.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,18 +11,20 @@
 LICENSE=       apache-2.0
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 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
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 TEST_DEPENDS=  # none; test depends are incompatible to py27
 do-test:
 .endif
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a2133891f233 -r a444ff5ca71b net/py-pypiserver/Makefile
--- a/net/py-pypiserver/Makefile        Tue Nov 09 23:13:36 2021 +0000
+++ b/net/py-pypiserver/Makefile        Tue Nov 09 23:18:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/01/11 10:31:59 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/11/09 23:18:58 wiz Exp $
 
 DISTNAME=      pypiserver-1.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,15 +15,16 @@
 DEPENDS+=      ${PYPKGPREFIX}-passlib>=1.6:../../security/py-passlib
 DEPENDS+=      ${PYPKGPREFIX}-watchdog-[0-9]*:../../sysutils/py-watchdog
 TEST_DEPENDS+= ${PYPKGPREFIX}-WebTest-[0-9]*:../../www/py-WebTest
-TEST_DEPENDS+= ${PYPKGPREFIX}-pip>=7:../../devel/py-pip
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 TEST_DEPENDS+= ${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine
+
 .include "../../lang/python/pyversion.mk"
+
 .if ${_PYTHON_VERSION} == 27
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 .endif
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= pip:test test:test
 
 USE_LANGUAGES= # none
 



Home | Main Index | Thread Index | Old Index