CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov  9 23:18:58 UTC 2021

Modified Files:
        pkgsrc/devel/py-cpplint: Makefile
        pkgsrc/devel/py-setuptools_scm: Makefile
        pkgsrc/lang/py-asttokens: Makefile
        pkgsrc/net/py-pypiserver: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-cpplint/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-setuptools_scm/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/py-asttokens/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/py-pypiserver/Makefile

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

Modified files:

Index: pkgsrc/devel/py-cpplint/Makefile
diff -u pkgsrc/devel/py-cpplint/Makefile:1.5 pkgsrc/devel/py-cpplint/Makefile:1.6
--- pkgsrc/devel/py-cpplint/Makefile:1.5        Mon Nov  1 18:58:33 2021
+++ pkgsrc/devel/py-cpplint/Makefile    Tue Nov  9 23:18:57 2021
@@ -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 @@ LICENSE=      modified-bsd
 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"
 

Index: pkgsrc/devel/py-setuptools_scm/Makefile
diff -u pkgsrc/devel/py-setuptools_scm/Makefile:1.25 pkgsrc/devel/py-setuptools_scm/Makefile:1.26
--- pkgsrc/devel/py-setuptools_scm/Makefile:1.25        Fri Mar  5 07:55:44 2021
+++ pkgsrc/devel/py-setuptools_scm/Makefile     Tue Nov  9 23:18:57 2021
@@ -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 @@ COMMENT=     Manage your versions by scm tag
 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
 

Index: pkgsrc/lang/py-asttokens/Makefile
diff -u pkgsrc/lang/py-asttokens/Makefile:1.15 pkgsrc/lang/py-asttokens/Makefile:1.16
--- pkgsrc/lang/py-asttokens/Makefile:1.15      Tue May  4 09:21:21 2021
+++ pkgsrc/lang/py-asttokens/Makefile   Tue Nov  9 23:18:58 2021
@@ -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 @@ COMMENT=    Annotate AST trees with source 
 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"

Index: pkgsrc/net/py-pypiserver/Makefile
diff -u pkgsrc/net/py-pypiserver/Makefile:1.5 pkgsrc/net/py-pypiserver/Makefile:1.6
--- pkgsrc/net/py-pypiserver/Makefile:1.5       Mon Jan 11 10:31:59 2021
+++ pkgsrc/net/py-pypiserver/Makefile   Tue Nov  9 23:18:58 2021
@@ -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 @@ BUILD_DEPENDS+=     ${PYPKGPREFIX}-wheel>=0.
 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