Tue Nov 9 23:18:58 2021 UTC ()
*: convert pip users to lang/python/versioned_dependencies.mk


(wiz)
diff -r1.5 -r1.6 pkgsrc/devel/py-cpplint/Makefile
diff -r1.25 -r1.26 pkgsrc/devel/py-setuptools_scm/Makefile
diff -r1.15 -r1.16 pkgsrc/lang/py-asttokens/Makefile
diff -r1.5 -r1.6 pkgsrc/net/py-pypiserver/Makefile

cvs diff -r1.5 -r1.6 pkgsrc/devel/py-cpplint/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-cpplint/Makefile 2021/11/01 18:58:33 1.5
+++ pkgsrc/devel/py-cpplint/Makefile 2021/11/09 23:18:57 1.6
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.5 2021/11/01 18:58:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2021/11/09 23:18:57 wiz Exp $
2 2
3DISTNAME= cpplint-1.5.5 3DISTNAME= cpplint-1.5.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= devel python 5CATEGORIES= devel python
6MASTER_SITES= ${MASTER_SITE_PYPI:=c/cpplint/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=c/cpplint/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/cpplint/cpplint 9HOMEPAGE= https://github.com/cpplint/cpplint
10COMMENT= Static code checker for C++ 10COMMENT= Static code checker for C++
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner 13BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
14TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov 14TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
15#TEST_DEPENDS+= ${PYPKGPREFIX}-testfixtures-[0-9]*:../../devel/py-testfixtures 15#TEST_DEPENDS+= ${PYPKGPREFIX}-testfixtures-[0-9]*:../../devel/py-testfixtures
16TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip 
17 16
18PYTHON_VERSIONED_DEPENDENCIES= test:test zipp:test pyparsing:test 17PYTHON_VERSIONED_DEPENDENCIES= pip:tool test:test zipp:test pyparsing:test
19 18
20.include "../../lang/python/pyversion.mk" 19.include "../../lang/python/pyversion.mk"
21 20
22.if ${_PYTHON_VERSION} == 27 21.if ${_PYTHON_VERSION} == 27
23TEST_DEPENDS+= ${PYPKGPREFIX}-configparser-[0-9]*:../../devel/py-configparser 22TEST_DEPENDS+= ${PYPKGPREFIX}-configparser-[0-9]*:../../devel/py-configparser
24.endif 23.endif
25 24
26post-install: 25post-install:
27 cd ${DESTDIR}${PREFIX}/bin && \ 26 cd ${DESTDIR}${PREFIX}/bin && \
28 ${MV} cpplint cpplint-${PYVERSSUFFIX} || ${TRUE} 27 ${MV} cpplint cpplint-${PYVERSSUFFIX} || ${TRUE}
29 28
30.include "../../lang/python/egg.mk" 29.include "../../lang/python/egg.mk"
31.include "../../lang/python/versioned_dependencies.mk" 30.include "../../lang/python/versioned_dependencies.mk"

cvs diff -r1.25 -r1.26 pkgsrc/devel/py-setuptools_scm/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-setuptools_scm/Makefile 2021/03/05 07:55:44 1.25
+++ pkgsrc/devel/py-setuptools_scm/Makefile 2021/11/09 23:18:57 1.26
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1# $NetBSD: Makefile,v 1.25 2021/03/05 07:55:44 adam Exp $ 1# $NetBSD: Makefile,v 1.26 2021/11/09 23:18:57 wiz Exp $
2 2
3DISTNAME= setuptools_scm-5.0.2 3DISTNAME= setuptools_scm-5.0.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= devel python 5CATEGORIES= devel python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/setuptools_scm/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=s/setuptools_scm/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/pypa/setuptools_scm 9HOMEPAGE= https://github.com/pypa/setuptools_scm
10COMMENT= Manage your versions by scm tags 10COMMENT= Manage your versions by scm tags
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= ${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml 13DEPENDS+= ${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
14TEST_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip 
15TEST_DEPENDS+= ${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial 14TEST_DEPENDS+= ${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
16 15
17PYTHON_VERSIONED_DEPENDENCIES= test:test 16PYTHON_VERSIONED_DEPENDENCIES= pip:test test:test
18 17
19USE_LANGUAGES= # none 18USE_LANGUAGES= # none
20 19
21do-test: 20do-test:
22 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} testing 21 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} testing
23 22
24.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
25.include "../../lang/python/versioned_dependencies.mk" 24.include "../../lang/python/versioned_dependencies.mk"
26.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"

cvs diff -r1.15 -r1.16 pkgsrc/lang/py-asttokens/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/py-asttokens/Makefile 2021/05/04 09:21:21 1.15
+++ pkgsrc/lang/py-asttokens/Makefile 2021/11/09 23:18:58 1.16
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.15 2021/05/04 09:21:21 adam Exp $ 1# $NetBSD: Makefile,v 1.16 2021/11/09 23:18:58 wiz Exp $
2 2
3DISTNAME= asttokens-2.0.5 3DISTNAME= asttokens-2.0.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= lang python 5CATEGORIES= lang python
6MASTER_SITES= ${MASTER_SITE_PYPI:=a/asttokens/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=a/asttokens/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/gristlabs/asttokens 9HOMEPAGE= https://github.com/gristlabs/asttokens
10COMMENT= Annotate AST trees with source code positions 10COMMENT= Annotate AST trees with source code positions
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm 13BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
14BUILD_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip 
15DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 14DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
16TEST_DEPENDS+= ${PYPKGPREFIX}-astroid-[0-9]*:../../devel/py-astroid 15TEST_DEPENDS+= ${PYPKGPREFIX}-astroid-[0-9]*:../../devel/py-astroid
17TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 16TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
18 17
19USE_LANGUAGES= # none 18USE_LANGUAGES= # none
20 19
 20PYTHON_VERSIONED_DEPENDENCIES+= pip:build
 21
21.include "../../lang/python/pyversion.mk" 22.include "../../lang/python/pyversion.mk"
22.if ${_PYTHON_VERSION} == 27 23.if ${_PYTHON_VERSION} == 27
23TEST_DEPENDS= # none; test depends are incompatible to py27 24TEST_DEPENDS= # none; test depends are incompatible to py27
24do-test: 25do-test:
25.endif 26.endif
26 27
 28.include "../../lang/python/versioned_dependencies.mk"
27.include "../../lang/python/egg.mk" 29.include "../../lang/python/egg.mk"
28.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/net/py-pypiserver/Makefile (expand / switch to unified diff)

--- pkgsrc/net/py-pypiserver/Makefile 2021/01/11 10:31:59 1.5
+++ pkgsrc/net/py-pypiserver/Makefile 2021/11/09 23:18:58 1.6
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.5 2021/01/11 10:31:59 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2021/11/09 23:18:58 wiz Exp $
2 2
3DISTNAME= pypiserver-1.4.2 3DISTNAME= pypiserver-1.4.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= net python 5CATEGORIES= net python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pypiserver/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pypiserver/}
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/pypiserver/pypiserver 10HOMEPAGE= https://github.com/pypiserver/pypiserver
11COMMENT= Minimal PyPI server for use with pip/easy_install 11COMMENT= Minimal PyPI server for use with pip/easy_install
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.25.0:../../devel/py-wheel 14BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.25.0:../../devel/py-wheel
15DEPENDS+= ${PYPKGPREFIX}-passlib>=1.6:../../security/py-passlib 15DEPENDS+= ${PYPKGPREFIX}-passlib>=1.6:../../security/py-passlib
16DEPENDS+= ${PYPKGPREFIX}-watchdog-[0-9]*:../../sysutils/py-watchdog 16DEPENDS+= ${PYPKGPREFIX}-watchdog-[0-9]*:../../sysutils/py-watchdog
17TEST_DEPENDS+= ${PYPKGPREFIX}-WebTest-[0-9]*:../../www/py-WebTest 17TEST_DEPENDS+= ${PYPKGPREFIX}-WebTest-[0-9]*:../../www/py-WebTest
18TEST_DEPENDS+= ${PYPKGPREFIX}-pip>=7:../../devel/py-pip 
19TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox 18TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
20TEST_DEPENDS+= ${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine 19TEST_DEPENDS+= ${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine
 20
21.include "../../lang/python/pyversion.mk" 21.include "../../lang/python/pyversion.mk"
 22
22.if ${_PYTHON_VERSION} == 27 23.if ${_PYTHON_VERSION} == 27
23TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 24TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
24.endif 25.endif
25 26
26PYTHON_VERSIONED_DEPENDENCIES= test:test 27PYTHON_VERSIONED_DEPENDENCIES= pip:test test:test
27 28
28USE_LANGUAGES= # none 29USE_LANGUAGES= # none
29 30
30post-install: 31post-install:
31 cd ${DESTDIR}${PREFIX}/bin && \ 32 cd ${DESTDIR}${PREFIX}/bin && \
32 ${MV} pypi-server pypi-server-${PYVERSSUFFIX} || ${TRUE} 33 ${MV} pypi-server pypi-server-${PYVERSSUFFIX} || ${TRUE}
33 34
34.include "../../lang/python/egg.mk" 35.include "../../lang/python/egg.mk"
35.include "../../lang/python/versioned_dependencies.mk" 36.include "../../lang/python/versioned_dependencies.mk"
36.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"