py-flake8: updated to 3.6.0

3.6.0:

Features
Add paths to allow local plugins to exist outside of sys.path
Copy setup.cfg files to the temporary git hook execution directory
Only skip a file if flake8: noqa is on a line by itself
Provide a better user experience for broken plugins
Report E902 when a file passed on the command line does not exist
Add --extend-ignore for extending the default ignore instead of overriding it

Bugs Fixed
Respect a formatter’s newline setting when printing
Fix leaking of processes in the legacy api
Fix a SyntaxWarning for an invalid escape sequence
Fix DeprecationWarning due to import of abc classes from the collections module
Defer setuptools import to improve flake8 startup time
Fix inconsistent line endings in FileProcessor.lines when running under python 3.x

5 files changed, 14 insertions, 92 deletions

diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index 0f7a162413d..b7e72f3bc98 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2018/09/28 15:45:15 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2018/10/24 10:35:46 adam Exp $
 
-DISTNAME=	flake8-3.5.0
+DISTNAME=	flake8-3.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/flake8/}
 
@@ -11,19 +10,21 @@ HOMEPAGE=	https://gitlab.com/pycqa/flake8
 COMMENT=	Modular source code checker for Python programs
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-flakes>=1.5.0:../../devel/py-flakes
-DEPENDS+=	${PYPKGPREFIX}-mccabe>=0.6.0:../../devel/py-mccabe
 DEPENDS+=	${PYPKGPREFIX}-codestyle>=2.4.0:../../devel/py-codestyle
+DEPENDS+=	${PYPKGPREFIX}-flakes>=2.0.0:../../devel/py-flakes
+DEPENDS+=	${PYPKGPREFIX}-mccabe>=0.6.0:../../devel/py-mccabe
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=30:../../devel/py-codestyle
 .include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py27"
+.if ${_PYTHON_VERSION} == 27
 DEPENDS+=	${PYPKGPREFIX}-configparser-[0-9]*:../../devel/py-configparser
 DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
 .endif
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-
-TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+=	${PYPKGPREFIX}-mock>=2.0.0:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
+USE_LANGUAGES=	# none
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} flake8 flake8-${PYVERSSUFFIX} || ${TRUE}
 
diff --git a/devel/py-flake8/distinfo b/devel/py-flake8/distinfo
index 1f2fdc962e3..34e16f15e43 100644
--- a/devel/py-flake8/distinfo
+++ b/devel/py-flake8/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.13 2018/06/18 11:17:54 adam Exp $
+$NetBSD: distinfo,v 1.14 2018/10/24 10:35:46 adam Exp $
 
-SHA1 (flake8-3.5.0.tar.gz) = 302f39432917f57bb4f0f1c1573c96074913b46f
-RMD160 (flake8-3.5.0.tar.gz) = 4533c09c33394ca31ab081ed09f370dfac415882
-SHA512 (flake8-3.5.0.tar.gz) = ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
-Size (flake8-3.5.0.tar.gz) = 140608 bytes
-SHA1 (patch-setup.cfg) = f0bcf4fc363a933365c553d1957c9892ce364802
-SHA1 (patch-setup.py) = b04563b206e065044d24955868cd38408b9a013f
-SHA1 (patch-tox.ini) = ff417d4d05a5846db467015f19fba095e368ef70
+SHA1 (flake8-3.6.0.tar.gz) = a00b23465dac455796e32bfbe76cfef3434003fb
+RMD160 (flake8-3.6.0.tar.gz) = 991d42b9e138b0368bc0670cdb5cdef483bb713e
+SHA512 (flake8-3.6.0.tar.gz) = f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
+Size (flake8-3.6.0.tar.gz) = 144684 bytes
diff --git a/devel/py-flake8/patches/patch-setup.cfg b/devel/py-flake8/patches/patch-setup.cfg
deleted file mode 100644
index 335321cf0ce..00000000000
--- a/devel/py-flake8/patches/patch-setup.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-setup.cfg,v 1.4 2018/06/18 11:17:54 adam Exp $
-
-Allow newer py-flakes.
-Add support for pycodestyle-2.4.0.
-
-From upstream commits 0273ca56, 85c503de, 68782675, e61d9d24, ef1d5cee.
-
---- setup.cfg.orig	2017-10-23 11:16:02.000000000 +0000
-+++ setup.cfg
-@@ -8,8 +8,8 @@ universal = 1
- requires-dist = 
- 	enum34; python_version<"3.4"
- 	configparser; python_version<"3.2"
--	pyflakes >= 1.5.0, < 1.7.0
--	pycodestyle >= 2.0.0, < 2.4.0
-+	pyflakes >= 1.5.0
-+	pycodestyle >= 2.4.0
- 	mccabe >= 0.6.0, < 0.7.0
- 
- [egg_info]
diff --git a/devel/py-flake8/patches/patch-setup.py b/devel/py-flake8/patches/patch-setup.py
deleted file mode 100644
index cc14600e4f9..00000000000
--- a/devel/py-flake8/patches/patch-setup.py
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-setup.py,v 1.4 2018/06/18 11:17:54 adam Exp $
-
-Allow newer py-flakes.
-Add support for pycodestyle-2.4.0.
-
-From upstream commits 0273ca56, 85c503de, 68782675, e61d9d24, ef1d5cee.
-
---- setup.py.orig	2017-08-08 00:31:43.000000000 +0000
-+++ setup.py
-@@ -21,8 +21,8 @@ requires = [
-     # http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
-     # And in which releases we will update those ranges here:
-     # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
--    "pyflakes >= 1.5.0, < 1.7.0",
--    "pycodestyle >= 2.0.0, < 2.4.0",
-+    "pyflakes >= 1.5.0",
-+    "pycodestyle >= 2.4.0",
-     "mccabe >= 0.6.0, < 0.7.0",
-     "setuptools >= 30",
- ]
-@@ -108,7 +108,8 @@ setuptools.setup(
-             PEP8_PLUGIN('module_imports_on_top_of_file'),
-             PEP8_PLUGIN('compound_statements'),
-             PEP8_PLUGIN('explicit_line_join'),
--            PEP8_PLUGIN('break_around_binary_operator'),
-+            PEP8_PLUGIN('break_after_binary_operator'),
-+            PEP8_PLUGIN('break_before_binary_operator'),
-             PEP8_PLUGIN('comparison_to_singleton'),
-             PEP8_PLUGIN('comparison_negative'),
-             PEP8_PLUGIN('comparison_type'),
-@@ -118,6 +119,8 @@ setuptools.setup(
-             PEP8_PLUGIN('python_3000_raise_comma'),
-             PEP8_PLUGIN('python_3000_not_equal'),
-             PEP8_PLUGIN('python_3000_backticks'),
-+            PEP8_PLUGIN('python_3000_invalid_escape_sequence'),
-+            PEP8_PLUGIN('python_3000_async_await_keywords'),
-         ],
-         'flake8.report': [
-             'default = flake8.formatting.default:Default',
diff --git a/devel/py-flake8/patches/patch-tox.ini b/devel/py-flake8/patches/patch-tox.ini
deleted file mode 100644
index edf2bb05b0c..00000000000
--- a/devel/py-flake8/patches/patch-tox.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-tox.ini,v 1.1 2018/05/14 07:39:55 leot Exp $
-
-Add support for pycodestyle-2.4.0.
-
-From upstream commits 0273ca56, 85c503de, 68782675, e61d9d24, ef1d5cee.
-
---- tox.ini.orig	2017-05-28 13:15:48.000000000 +0000
-+++ tox.ini
-@@ -141,7 +141,7 @@ commands =
- # defaults to selecting all other errors so we do not need select=E,F,W,I,D
- # Once Flake8 3.0 is released and in a good state, we can use both and it will
- # work well \o/
--ignore = D203
-+ignore = D203, W504
- exclude =
-     .tox,
-     .git,