Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id CF7601A923D for ; Sat, 29 Jan 2022 08:48:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0A3D784E6B; Sat, 29 Jan 2022 08:48:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 460A584E54 for ; Sat, 29 Jan 2022 08:48:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id cQ6vi_FFlr3Q for ; Sat, 29 Jan 2022 08:48:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0FEE184C13 for ; Sat, 29 Jan 2022 08:48:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 04354FB24; Sat, 29 Jan 2022 08:48:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1643446121273530" MIME-Version: 1.0 Date: Sat, 29 Jan 2022 08:48:41 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220129084842.04354FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1643446121273530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jan 29 08:48:41 UTC 2022 Modified Files: pkgsrc/devel/py-argcomplete: Makefile pkgsrc/devel/py-flake8-docstrings: Makefile pkgsrc/devel/py-flake8-import-order: Makefile pkgsrc/devel/py-flake8-polyfill: Makefile pkgsrc/devel/py-logan: Makefile pkgsrc/devel/py-test-flake8: Makefile pkgsrc/net/py-responses: Makefile pkgsrc/sysutils/collectd-haproxy: Makefile pkgsrc/sysutils/py-kazoo: Makefile pkgsrc/textproc/yq: Makefile pkgsrc/www/py-furl: Makefile pkgsrc/www/py-raven: Makefile Log Message: *: convert py-flake8 users to versioned_dependencies To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-argcomplete/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-flake8-docstrings/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-flake8-import-order/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-flake8-polyfill/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-logan/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-test-flake8/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/py-responses/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/collectd-haproxy/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/py-kazoo/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/yq/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/py-furl/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/py-raven/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1643446121273530 Content-Disposition: inline Content-Length: 11796 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-argcomplete/Makefile diff -u pkgsrc/devel/py-argcomplete/Makefile:1.27 pkgsrc/devel/py-argcomplete/Makefile:1.28 --- pkgsrc/devel/py-argcomplete/Makefile:1.27 Tue Jan 25 09:05:10 2022 +++ pkgsrc/devel/py-argcomplete/Makefile Sat Jan 29 08:48:40 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/01/25 09:05:10 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2022/01/29 08:48:40 wiz Exp $ DISTNAME= argcomplete-1.12.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,13 +12,13 @@ COMMENT= Bash tab completion for argpars LICENSE= apache-2.0 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage -TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel .include "../../lang/python/pyversion.mk" .if ${_PYTHON_VERSION} < 38 PYTHON_VERSIONED_DEPENDENCIES+= importlib-metadata .endif +PYTHON_VERSIONED_DEPENDENCIES+= flake8:test USE_LANGUAGES= # none Index: pkgsrc/devel/py-flake8-docstrings/Makefile diff -u pkgsrc/devel/py-flake8-docstrings/Makefile:1.4 pkgsrc/devel/py-flake8-docstrings/Makefile:1.5 --- pkgsrc/devel/py-flake8-docstrings/Makefile:1.4 Tue Jan 4 20:53:05 2022 +++ pkgsrc/devel/py-flake8-docstrings/Makefile Sat Jan 29 08:48:40 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:05 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2022/01/29 08:48:40 wiz Exp $ DISTNAME= flake8-docstrings-1.6.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,9 +12,11 @@ COMMENT= Extension for flake8 using pydo LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-docstyle>=2.1.0:../../devel/py-docstyle -DEPENDS+= ${PYPKGPREFIX}-flake8>=3.0.0:../../devel/py-flake8 + +PYTHON_VERSIONED_DEPENDENCIES+= flake8 USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-flake8-import-order/Makefile diff -u pkgsrc/devel/py-flake8-import-order/Makefile:1.14 pkgsrc/devel/py-flake8-import-order/Makefile:1.15 --- pkgsrc/devel/py-flake8-import-order/Makefile:1.14 Tue Jan 4 20:53:05 2022 +++ pkgsrc/devel/py-flake8-import-order/Makefile Sat Jan 29 08:48:40 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/01/04 20:53:05 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2022/01/29 08:48:40 wiz Exp $ DISTNAME= flake8-import-order-0.18.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,10 +13,10 @@ LICENSE= gnu-lgpl-v3 DEPENDS+= ${PYPKGPREFIX}-asttokens-[0-9]*:../../lang/py-asttokens DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle -TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-lama-[0-9]*:../../devel/py-lama -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= flake8:test do-test: cd ${WRKSRC} && pytest-${PYVERSSUFFIX} Index: pkgsrc/devel/py-flake8-polyfill/Makefile diff -u pkgsrc/devel/py-flake8-polyfill/Makefile:1.4 pkgsrc/devel/py-flake8-polyfill/Makefile:1.5 --- pkgsrc/devel/py-flake8-polyfill/Makefile:1.4 Tue Jan 4 20:53:05 2022 +++ pkgsrc/devel/py-flake8-polyfill/Makefile Sat Jan 29 08:48:40 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:05 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2022/01/29 08:48:40 wiz Exp $ DISTNAME= flake8-polyfill-1.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,10 +11,10 @@ HOMEPAGE= https://gitlab.com/pycqa/flake COMMENT= Polyfill package for Flake8 plugins LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8 -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= flake8 USE_LANGUAGES= # none Index: pkgsrc/devel/py-logan/Makefile diff -u pkgsrc/devel/py-logan/Makefile:1.11 pkgsrc/devel/py-logan/Makefile:1.12 --- pkgsrc/devel/py-logan/Makefile:1.11 Tue Jan 4 20:53:15 2022 +++ pkgsrc/devel/py-logan/Makefile Sat Jan 29 08:48:40 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/01/04 20:53:15 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2022/01/29 08:48:40 wiz Exp $ DISTNAME= logan-0.7.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,12 +11,14 @@ HOMEPAGE= https://github.com/dcramer/log COMMENT= Toolkit for building standalone Django applications LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-django>=1.5:../../www/py-django TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=0.8.0:../../devel/py-mock TEST_DEPENDS+= ${PYPKGPREFIX}-nose>=1.1.2:../../devel/py-nose +PYTHON_VERSIONED_DEPENDENCIES+= flake8 + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-test-flake8/Makefile diff -u pkgsrc/devel/py-test-flake8/Makefile:1.11 pkgsrc/devel/py-test-flake8/Makefile:1.12 --- pkgsrc/devel/py-test-flake8/Makefile:1.11 Tue Jan 4 20:53:41 2022 +++ pkgsrc/devel/py-test-flake8/Makefile Sat Jan 29 08:48:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/01/04 20:53:41 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2022/01/29 08:48:41 wiz Exp $ DISTNAME= pytest-flake8-1.0.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -11,9 +11,8 @@ HOMEPAGE= https://github.com/tholo/pytes COMMENT= Plugin plugin to check FLAKE8 requirements LICENSE= modified-bsd -DEPENDS+= ${PYPKGPREFIX}-flake8>=3.5:../../devel/py-flake8 - -PYTHON_VERSIONED_DEPENDENCIES= test +PYTHON_VERSIONED_DEPENDENCIES+= test +PYTHON_VERSIONED_DEPENDENCIES+= flake8 USE_LANGUAGES= # none Index: pkgsrc/net/py-responses/Makefile diff -u pkgsrc/net/py-responses/Makefile:1.27 pkgsrc/net/py-responses/Makefile:1.28 --- pkgsrc/net/py-responses/Makefile:1.27 Mon Jan 24 18:24:47 2022 +++ pkgsrc/net/py-responses/Makefile Sat Jan 29 08:48:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/01/24 18:24:47 adam Exp $ +# $NetBSD: Makefile,v 1.28 2022/01/29 08:48:41 wiz Exp $ DISTNAME= responses-0.17.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,11 +21,11 @@ DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../ .endif TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=3.7.1:../../devel/py-coverage -TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= flake8:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test USE_LANGUAGES= # none Index: pkgsrc/sysutils/collectd-haproxy/Makefile diff -u pkgsrc/sysutils/collectd-haproxy/Makefile:1.2 pkgsrc/sysutils/collectd-haproxy/Makefile:1.3 --- pkgsrc/sysutils/collectd-haproxy/Makefile:1.2 Tue Jan 4 20:54:46 2022 +++ pkgsrc/sysutils/collectd-haproxy/Makefile Sat Jan 29 08:48:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:46 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2022/01/29 08:48:41 wiz Exp $ DISTNAME= collectd-haproxy-1.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,9 +15,11 @@ COMMENT= Plugin for collectd to gather H LICENSE= mit DEPENDS+= haproxy>=1.4:../../net/haproxy -DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock DEPENDS+= ${PYPKGPREFIX}-collectd-[0-9]*:../../sysutils/py-collectd +PYTHON_VERSIONED_DEPENDENCIES+= flake8 + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/py-kazoo/Makefile diff -u pkgsrc/sysutils/py-kazoo/Makefile:1.8 pkgsrc/sysutils/py-kazoo/Makefile:1.9 --- pkgsrc/sysutils/py-kazoo/Makefile:1.8 Tue Jan 4 20:54:48 2022 +++ pkgsrc/sysutils/py-kazoo/Makefile Sat Jan 29 08:48:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:48 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2022/01/29 08:48:41 wiz Exp $ DISTNAME= kazoo-2.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,11 +13,13 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage -TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose USE_LANGUAGES= # none +PYTHON_VERSIONED_DEPENDENCIES+= flake8:test + .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/yq/Makefile diff -u pkgsrc/textproc/yq/Makefile:1.4 pkgsrc/textproc/yq/Makefile:1.5 --- pkgsrc/textproc/yq/Makefile:1.4 Wed Jan 5 15:41:27 2022 +++ pkgsrc/textproc/yq/Makefile Sat Jan 29 08:48:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:27 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2022/01/29 08:48:41 wiz Exp $ DISTNAME= yq-2.9.2 PKGREVISION= 3 @@ -18,11 +18,13 @@ DEPENDS+= ${PYPKGPREFIX}-toml-[0-9]*:../ # XXX test dysfunctional TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel -TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage +PYTHON_VERSIONED_DEPENDENCIES+= flake8:test + USE_PKG_RESOURCES= yes .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-furl/Makefile diff -u pkgsrc/www/py-furl/Makefile:1.22 pkgsrc/www/py-furl/Makefile:1.23 --- pkgsrc/www/py-furl/Makefile:1.22 Tue Jan 4 20:55:28 2022 +++ pkgsrc/www/py-furl/Makefile Sat Jan 29 08:48:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/01/04 20:55:28 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2022/01/29 08:48:41 wiz Exp $ DISTNAME= furl-2.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,9 +13,11 @@ LICENSE= unlicense DEPENDS+= ${PYPKGPREFIX}-orderedmultidict>=1.0.1:../../databases/py-orderedmultidict DEPENDS+= ${PYPKGPREFIX}-six>=1.8.0:../../lang/py-six -TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 + +PYTHON_VERSIONED_DEPENDENCIES+= flake8:test USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-raven/Makefile diff -u pkgsrc/www/py-raven/Makefile:1.13 pkgsrc/www/py-raven/Makefile:1.14 --- pkgsrc/www/py-raven/Makefile:1.13 Thu Jan 27 10:16:09 2022 +++ pkgsrc/www/py-raven/Makefile Sat Jan 29 08:48:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2022/01/27 10:16:09 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2022/01/29 08:48:41 wiz Exp $ DISTNAME= raven-6.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,7 +21,6 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-bottle-[0- TEST_DEPENDS+= ${PYPKGPREFIX}-celery>=2.5:../../net/py-celery TEST_DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle TEST_DEPENDS+= ${PYPKGPREFIX}-exam>=0.5.2:../../devel/py-exam -TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.5.0:../../devel/py-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-flask-login>=0.2.0:../../www/py-flask-login TEST_DEPENDS+= ${PYPKGPREFIX}-logbook-[0-9]*:../../devel/py-logbook TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock @@ -41,7 +40,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]* TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel TEST_DEPENDS+= ${PYPKGPREFIX}-zconfig-[0-9]*:../../devel/py-zconfig -PYTHON_VERSIONED_DEPENDENCIES= test:test +PYTHON_VERSIONED_DEPENDENCIES+= test:test +PYTHON_VERSIONED_DEPENDENCIES+= flake8:test USE_PKG_RESOURCES= yes --_----------=_1643446121273530--