with the latest py-mccabe update, the current flake8 stops working. in other news pep8 has been renamed to pycodestyle and newer flake8 uses that instead.
so here's: - a port for pycodestyle (sorry, i can't do the quirks song and dance) - flake8 update to the latest. 8 tests fail but they are all related to file paths of the build infrastructure, and i don't have time to play with this now... please test and commit. -f -- 2 wrongs don't make a right - but 3 lefts do!
pycodestyle.tgz
Description: application/tar-gz
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/flake8/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 28 Dec 2015 17:28:20 -0000 1.5
+++ Makefile 19 Oct 2016 20:59:51 -0000
@@ -2,7 +2,7 @@
COMMENT = modular python code checker wrapping pep8 and pyflakes
-MODPY_EGG_VERSION = 2.5.1
+MODPY_EGG_VERSION = 3.0.4
DISTNAME = flake8-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -21,14 +21,16 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
TEST_DEPENDS = ${RUN_DEPENDS} \
- devel/py-nose \
+ devel/py-test \
devel/py-mock
-RUN_DEPENDS = devel/pep8 \
+RUN_DEPENDS = devel/pycodestyle \
devel/py-mccabe \
- devel/pyflakes
+ devel/pyflakes \
+ devel/py-enum34 \
+ devel/py-configparser
do-test:
- cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests --first-package-wins
+ cd ${WRKSRC} && ${LOCALBASE}/bin/py.test
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/flake8/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 28 Dec 2015 17:28:20 -0000 1.2
+++ distinfo 19 Oct 2016 20:59:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (flake8-2.5.1.tar.gz) = RIrtSLBnH+YGL0e5jDCB86Szb76Z3bisKjvm5ssTVgM=
-SIZE (flake8-2.5.1.tar.gz) = 83692
+SHA256 (flake8-3.0.4.tar.gz) = tMIQyZjwfW/yQyXdkfvAEfLDe81r9XaxiN4B2GVulw0=
+SIZE (flake8-3.0.4.tar.gz) = 1382588
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/devel/flake8/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup_py
--- patches/patch-setup_py 28 Dec 2015 17:30:09 -0000 1.1
+++ patches/patch-setup_py 19 Oct 2016 20:59:51 -0000
@@ -1,14 +1,12 @@
$OpenBSD: patch-setup_py,v 1.1 2015/12/28 17:30:09 jca Exp $
-Our version of pep8 1.6.2 is patched.
-https://mail.python.org/pipermail/code-quality/2015-March/000515.html
---- setup.py.orig Sun Oct 25 21:27:50 2015
-+++ setup.py Thu Dec 24 05:47:55 2015
-@@ -50,7 +50,7 @@ setup(
- packages=["flake8", "flake8.tests"],
- install_requires=[
- "pyflakes >= 0.8.1, < 1.1",
-- "pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2",
-+ "pep8 >= 1.5.7, != 1.6.0, != 1.6.1",
- "mccabe >= 0.2.1, < 0.4",
- ],
- entry_points={
+--- setup.py.orig Wed Oct 19 22:49:00 2016
++++ setup.py Wed Oct 19 22:49:06 2016
+@@ -15,7 +15,7 @@ import flake8
+ tests_require = ['mock', 'pytest']
+
+ requires = [
+- "pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0",
++ "pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.4.0",
+ "pycodestyle >= 2.0.0, < 2.1.0",
+ "mccabe >= 0.5.0, < 0.6.0",
+ ]
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/flake8/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 18 Nov 2014 12:10:58 -0000 1.1.1.1
+++ pkg/DESCR 19 Oct 2016 20:59:51 -0000
@@ -1,3 +1,4 @@
Flake8 is a wrapper around python code checker tools such as
-PyFlakes, pep8 and Ned Batchelder's McCabe script. It displays
-the warnings in a per-file, merged output and is configurable.
+PyFlakes, pycodestyle and Ned Batchelder's McCabe script.
+It displays the warnings in a per-file, merged output
+and is configurable.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/flake8/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 28 Dec 2015 17:28:20 -0000 1.2
+++ pkg/PLIST 19 Oct 2016 20:59:51 -0000
@@ -6,45 +6,72 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/flake8/__init__.py
lib/python${MODPY_VERSION}/site-packages/flake8/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/flake8/__main__.py
lib/python${MODPY_VERSION}/site-packages/flake8/__main__.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/_pyflakes.py
-lib/python${MODPY_VERSION}/site-packages/flake8/_pyflakes.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/callbacks.py
-lib/python${MODPY_VERSION}/site-packages/flake8/callbacks.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/compat.py
-lib/python${MODPY_VERSION}/site-packages/flake8/compat.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/engine.py
-lib/python${MODPY_VERSION}/site-packages/flake8/engine.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/hooks.py
-lib/python${MODPY_VERSION}/site-packages/flake8/hooks.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/main.py
-lib/python${MODPY_VERSION}/site-packages/flake8/main.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/reporter.py
-lib/python${MODPY_VERSION}/site-packages/flake8/reporter.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/run.py
-lib/python${MODPY_VERSION}/site-packages/flake8/run.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/_test_warnings.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/_test_warnings.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_engine.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_engine.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_hooks.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_hooks.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_integration.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_integration.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_main.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_main.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_reporter.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_reporter.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_util.py
-lib/python${MODPY_VERSION}/site-packages/flake8/tests/test_util.pyc
-lib/python${MODPY_VERSION}/site-packages/flake8/util.py
-lib/python${MODPY_VERSION}/site-packages/flake8/util.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/api/
+lib/python${MODPY_VERSION}/site-packages/flake8/api/__init__.py
+lib/python${MODPY_VERSION}/site-packages/flake8/api/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/api/legacy.py
+lib/python${MODPY_VERSION}/site-packages/flake8/api/legacy.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/checker.py
+lib/python${MODPY_VERSION}/site-packages/flake8/checker.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/defaults.py
+lib/python${MODPY_VERSION}/site-packages/flake8/defaults.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/flake8/exceptions.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/__init__.py
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/base.py
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/base.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/default.py
+lib/python${MODPY_VERSION}/site-packages/flake8/formatting/default.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/
+lib/python${MODPY_VERSION}/site-packages/flake8/main/__init__.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/application.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/application.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/cli.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/cli.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/git.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/git.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/mercurial.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/mercurial.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/options.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/options.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/setuptools_command.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/setuptools_command.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/main/vcs.py
+lib/python${MODPY_VERSION}/site-packages/flake8/main/vcs.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/options/
+lib/python${MODPY_VERSION}/site-packages/flake8/options/__init__.py
+lib/python${MODPY_VERSION}/site-packages/flake8/options/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/options/aggregator.py
+lib/python${MODPY_VERSION}/site-packages/flake8/options/aggregator.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/options/config.py
+lib/python${MODPY_VERSION}/site-packages/flake8/options/config.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/options/manager.py
+lib/python${MODPY_VERSION}/site-packages/flake8/options/manager.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/__init__.py
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/_trie.py
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/_trie.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/manager.py
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/manager.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/notifier.py
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/notifier.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/pyflakes.py
+lib/python${MODPY_VERSION}/site-packages/flake8/plugins/pyflakes.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/processor.py
+lib/python${MODPY_VERSION}/site-packages/flake8/processor.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/statistics.py
+lib/python${MODPY_VERSION}/site-packages/flake8/statistics.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/style_guide.py
+lib/python${MODPY_VERSION}/site-packages/flake8/style_guide.pyc
+lib/python${MODPY_VERSION}/site-packages/flake8/utils.py
+lib/python${MODPY_VERSION}/site-packages/flake8/utils.pyc
