*: convert py-flake8 users to versioned_dependencies

12 files changed, 41 insertions, 30 deletions

diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile
index 8bdb1b4d2d2..fccd789ce87 100644
--- a/devel/py-argcomplete/Makefile
+++ b/devel/py-argcomplete/Makefile
@@ -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 argparse
 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
 
diff --git a/devel/py-flake8-docstrings/Makefile b/devel/py-flake8-docstrings/Makefile
index 12893470165..ae772e77d43 100644
--- a/devel/py-flake8-docstrings/Makefile
+++ b/devel/py-flake8-docstrings/Makefile
@@ -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 pydocstyle to check docstrings
 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"
diff --git a/devel/py-flake8-import-order/Makefile b/devel/py-flake8-import-order/Makefile
index 81e33ba3215..221f9e4fd5a 100644
--- a/devel/py-flake8-import-order/Makefile
+++ b/devel/py-flake8-import-order/Makefile
@@ -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}
diff --git a/devel/py-flake8-polyfill/Makefile b/devel/py-flake8-polyfill/Makefile
index 8cef5ea8623..bb01edc7f37 100644
--- a/devel/py-flake8-polyfill/Makefile
+++ b/devel/py-flake8-polyfill/Makefile
@@ -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/flake8
 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
 
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index 6890e5d638e..e2b3ff1d76f 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -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/logan
 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"
diff --git a/devel/py-test-flake8/Makefile b/devel/py-test-flake8/Makefile
index b60bdb9a235..9b45b6da574 100644
--- a/devel/py-test-flake8/Makefile
+++ b/devel/py-test-flake8/Makefile
@@ -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/pytest-flake8
 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
 
diff --git a/net/py-responses/Makefile b/net/py-responses/Makefile
index cc6f444bafc..bb8059766a8 100644
--- a/net/py-responses/Makefile
+++ b/net/py-responses/Makefile
@@ -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]*:../../devel/py-mock
 .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
 
diff --git a/sysutils/collectd-haproxy/Makefile b/sysutils/collectd-haproxy/Makefile
index 13be04c1074..d3142005383 100644
--- a/sysutils/collectd-haproxy/Makefile
+++ b/sysutils/collectd-haproxy/Makefile
@@ -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 HAProxy metrics
 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"
diff --git a/sysutils/py-kazoo/Makefile b/sysutils/py-kazoo/Makefile
index e679516c112..bf26b3b2901 100644
--- a/sysutils/py-kazoo/Makefile
+++ b/sysutils/py-kazoo/Makefile
@@ -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"
diff --git a/textproc/yq/Makefile b/textproc/yq/Makefile
index 58b4d26d852..c649be2d8dc 100644
--- a/textproc/yq/Makefile
+++ b/textproc/yq/Makefile
@@ -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]*:../../textproc/py-toml
 
 # 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"
diff --git a/www/py-furl/Makefile b/www/py-furl/Makefile
index 7a5a8341441..20e3cc71248 100644
--- a/www/py-furl/Makefile
+++ b/www/py-furl/Makefile
@@ -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"
diff --git a/www/py-raven/Makefile b/www/py-raven/Makefile
index fcc5d99be4f..e66fd076ad9 100644
--- a/www/py-raven/Makefile
+++ b/www/py-raven/Makefile
@@ -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-9]*:../../www/py-bottle
 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]*:../../devel/py-tox
 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