py-flake8: Backport patches from upstream for py-codestyle-2.4.0 update Since py-codestyle-2.4.0 update, py-flake8 no longer works. Backport all relevant commits from upstream to address that. PKGREVISION++ TODOleot: adjust py-codestyle DEPENDS pattern! Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/py-flake8/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 23 Mar 2018 21:09:11 -0000 1.13 +++ Makefile 13 May 2018 20:12:35 -0000 @@ -2,6 +2,7 @@ DISTNAME= flake8-3.5.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=f/flake8/} Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/devel/py-flake8/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 8 Nov 2017 08:39:04 -0000 1.11 +++ distinfo 13 May 2018 20:12:35 -0000 @@ -4,3 +4,6 @@ SHA1 (flake8-3.5.0.tar.gz) = 302f3943291 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) = 227164e8c9e0287227fadc13f522b84d6781acca +SHA1 (patch-setup.py) = 2027b7f24cc5f99e5f77a45c97338d0cc6d69404 +SHA1 (patch-tox.ini) = ff417d4d05a5846db467015f19fba095e368ef70 Index: patches/patch-setup.cfg =================================================================== RCS file: patches/patch-setup.cfg diff -N patches/patch-setup.cfg --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-setup.cfg 13 May 2018 20:12:35 -0000 @@ -0,0 +1,17 @@ +$NetBSD$ + +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 +@@ -9,7 +9,7 @@ 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 ++ pycodestyle >= 2.4.0, < 2.5.0 + mccabe >= 0.6.0, < 0.7.0 + + [egg_info] Index: patches/patch-setup.py =================================================================== RCS file: patches/patch-setup.py diff -N patches/patch-setup.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-setup.py 13 May 2018 20:12:35 -0000 @@ -0,0 +1,36 @@ +$NetBSD$ + +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 +@@ -22,7 +22,7 @@ requires = [ + # 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", ++ "pycodestyle >= 2.4.0, < 2.5.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', Index: patches/patch-tox.ini =================================================================== RCS file: patches/patch-tox.ini diff -N patches/patch-tox.ini --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tox.ini 13 May 2018 20:12:35 -0000 @@ -0,0 +1,17 @@ +$NetBSD$ + +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,