<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/62b6fe25fd3fa1891f663ba1c4ab58210bd91eb7">https://github.com/macports/macports-ports/commit/62b6fe25fd3fa1891f663ba1c4ab58210bd91eb7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 62b6fe25fd3fa1891f663ba1c4ab58210bd91eb7
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Fri Aug 17 10:01:55 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-flake8: patches for latest pycodestyle and pyflakes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - fix setuptools dependency type (runtime)
</span><span style='display:block; white-space:pre;color:#404040;'> - enable tests
</span><span style='display:block; white-space:pre;color:#404040;'> - update livecheck
</span>---
python/py-flake8/Portfile | 33 ++++++++++++-----
python/py-flake8/files/patch-pr230.diff | 33 +++++++++++++++++
python/py-flake8/files/patch-pr239.diff | 65 +++++++++++++++++++++++++++++++++
3 files changed, 121 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-flake8/Portfile b/python/py-flake8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f7fe28..a6d0520 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-flake8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-flake8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,6 +9,7 @@ set _n [string index ${_name} 0]
</span>
name py-${_name}
version 3.5.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append devel
platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,18 +31,22 @@ homepage http://flake8.readthedocs.org/
</span> distname ${_name}-${version}
master_sites pypi:${_n}/${_name}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 7e5fe39d578a2c2d0962b61b35b8c3fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4533c09c33394ca31ab081ed09f370dfac415882 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4533c09c33394ca31ab081ed09f370dfac415882 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 140608
</span>
python.versions 27 34 35 36 37
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pytest-runner
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # apply upstream patches so that flake8 works with latest versions of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pycodestyle and py-flakes [remove when new version is released]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-pr230.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pr239.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-pytest-runner
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyflakes \
</span> port:py${python.version}-codestyle \
port:py${python.version}-flake8-mccabe
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,9 +78,17 @@ port select --set ${select.group} [file tail ${select.file}]
</span> ${dest_doc}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pytest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd py.test-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env PYTHONPATH=${worksrcpath}/build/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://pypi.python.org/pypi/${_name}/json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "\"${_name}-(\[.\\d\]+)\\${extract.suffix}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type pypi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.name flake8
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-flake8/files/patch-pr230.diff b/python/py-flake8/files/patch-pr230.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..809d7b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-flake8/files/patch-pr230.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2018-08-17 12:10:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2018-08-17 12:11:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # And in which releases we will update those ranges here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "pyflakes >= 1.5.0, < 1.7.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "pycodestyle >= 2.0.0, < 2.4.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "pycodestyle >= 2.0.0, < 2.5.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "mccabe >= 0.6.0, < 0.7.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "setuptools >= 30",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +108,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PEP8_PLUGIN('module_imports_on_top_of_file'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PEP8_PLUGIN('compound_statements'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PEP8_PLUGIN('explicit_line_join'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PEP8_PLUGIN('break_around_binary_operator'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PEP8_PLUGIN('break_after_binary_operator'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PEP8_PLUGIN('break_before_binary_operator'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PEP8_PLUGIN('comparison_to_singleton'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PEP8_PLUGIN('comparison_negative'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PEP8_PLUGIN('comparison_type'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.cfg.orig 2018-08-17 12:10:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.cfg 2018-08-17 12:10:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum34; python_version<"3.4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configparser; python_version<"3.2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyflakes >= 1.5.0, < 1.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pycodestyle >= 2.0.0, < 2.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pycodestyle >= 2.0.0, < 2.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mccabe >= 0.6.0, < 0.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [egg_info]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-flake8/files/patch-pr239.diff b/python/py-flake8/files/patch-pr239.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..59b1a1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-flake8/files/patch-pr239.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2018-08-17 12:14:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2018-08-17 12:15:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # And in which releases we will update those ranges here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "pyflakes >= 1.5.0, < 1.7.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "pyflakes >= 2.0.0, < 2.1.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "pycodestyle >= 2.0.0, < 2.5.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "mccabe >= 0.6.0, < 0.7.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "setuptools >= 30",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.cfg.orig 2018-08-17 12:14:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.cfg 2018-08-17 12:15:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires-dist =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum34; python_version<"3.4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configparser; python_version<"3.2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pyflakes >= 1.5.0, < 1.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pyflakes >= 2.0.0, < 2.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pycodestyle >= 2.0.0, < 2.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mccabe >= 0.6.0, < 0.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docs/source/user/error-codes.rst.orig 2018-08-17 12:19:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docs/source/user/error-codes.rst 2018-08-17 12:18:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | F707 | an ``except:`` block as not the last exception handler |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| F721 | doctest syntax error |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| F722 | syntax error in forward type annotation |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | F811 | redefinition of unused ``name`` from line ``N`` |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,6 +73,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | F841 | local variable ``name`` is assigned to but never used |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| F901 | ``raise NotImplemented`` should be ``raise NotImplementedError`` |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++------+---------------------------------------------------------------------+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that some of these entries behave differently on Python 2 and Python 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for example F812 is specific to Python 2 only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/flake8/plugins/pyflakes.py.orig 2018-08-17 12:21:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/flake8/plugins/pyflakes.py 2018-08-17 12:21:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'ReturnOutsideFunction': 'F706',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'DefaultExceptNotLast': 'F707',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'DoctestSyntaxError': 'F721',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'ForwardAnnotationSyntaxError': 'F722',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'RedefinedWhileUnused': 'F811',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'RedefinedInListComp': 'F812',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'UndefinedName': 'F821',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'UndefinedLocal': 'F823',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'DuplicateArgument': 'F831',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'UnusedVariable': 'F841',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'RaiseNotImplemented': 'F901',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>