Updated py-flake8 to 3.0.4.

2.3.0 - 2015-01-04
------------------

- **Feature**: Add ``--output-file`` option to specify a file to write to
  instead of ``stdout``.

- **Bug** Fix interleaving of output while using multiprocessing
  (`GitLab#17`_)

.. _GitLab#17: https://gitlab.com/pycqa/flake8/issues/17

2.4.0 - 2015-03-07
------------------

- **Bug** Print filenames when using multiprocessing and ``-q`` option.
  (`GitLab#31`_)

- **Bug** Put upper cap on dependencies. The caps for 2.4.0 are:

  - ``pep8 < 1.6`` (Related to `GitLab#35`_)

  - ``mccabe < 0.4``

  - ``pyflakes < 0.9``

  See also `GitLab#32`_

- **Bug** Files excluded in a config file were not being excluded when flake8
  was run from a git hook. (`GitHub#2`_)

- **Improvement** Print warnings for users who are providing mutually
  exclusive options to flake8. (`GitLab#8`_, `GitLab!18`_)

- **Feature** Allow git hook configuration to live in ``.git/config``.
  See the updated `VCS hooks docs`_ for more details. (`GitLab!20`_)

2.4.1 - 2015-05-18
------------------

- **Bug** Do not raise a ``SystemError`` unless there were errors in the
  setuptools command. (`GitLab#39`_, `GitLab!23`_)

- **Bug** Do not verify dependencies of extensions loaded via entry-points.

- **Improvement** Blacklist versions of pep8 we know are broken

2.5.0 - 2015-10-26
------------------

- **Improvement** Raise cap on PyFlakes for Python 3.5 support

- **Improvement** Avoid deprecation warnings when loading extensions
  (`GitLab#59`_, `GitLab#90`_)

- **Improvement** Separate logic to enable "off-by-default" extensions
  (`GitLab#67`_)

- **Bug** Properly parse options to setuptools Flake8 command (`GitLab!41`_)

- **Bug** Fix exceptions when output on stdout is truncated before Flake8
  finishes writing the output (`GitLab#69`_)

- **Bug** Fix error on OS X where Flake8 can no longer acquire or create new
  semaphores (`GitLab#74`_)


2.5.1 - 2015-12-08
------------------

- **Bug** Properly look for ``.flake8`` in current working directory
  (`GitLab#103`_)

- **Bug** Monkey-patch ``pep8.stdin_get_value`` to cache the actual value in
  stdin. This helps plugins relying on the function when run with
  multiprocessing. (`GitLab#105`_, `GitLab#107`_)

2.5.2 - 2016-01-30
------------------

- **Bug** Parse ``output_file`` and ``enable_extensions`` from config files

- **Improvement** Raise upper bound on mccabe plugin to allow for version
  0.4.0

2.5.3 - 2016-02-11
------------------

- **Bug** Actually parse ``output_file`` and ``enable_extensions`` from config
  files

2.5.4 - 2016-02-11
------------------

- **Bug** Missed an attribute rename during the v2.5.3 release.

2.5.5 - 2016-06-14
------------------

- **Bug** Fix setuptools integration when parsing config files

- **Bug** Don't pass the user's config path as the config_file when creating a
  StyleGuide

2.6.0 - 2016-06-15
------------------

- **Requirements Change** Switch to pycodestyle as all future pep8 releases
  will use that package name

- **Improvement** Allow for Windows users on *select* versions of Python to
  use ``--jobs`` and multiprocessing

- **Improvement** Update bounds on McCabe

- **Improvement** Update bounds on PyFlakes and blacklist known broken
  versions

- **Improvement** Handle new PyFlakes warning with a new error code: F405

2.6.1 - 2016-06-25
------------------

- **Bug** Update the config files to search for to include ``setup.cfg`` and
  ``tox.ini``. This was broken in 2.5.5 when we stopped passing
  ``config_file`` to our Style Guide

2.6.2 - 2016-06-25
------------------

- **Bug** Fix packaging error during release process.
3.0.0 -- 2016-07-25
-------------------

- Rewrite our documentation from scratch! (http://flake8.pycqa.org)

- Drop explicit support for Pythons 2.6, 3.2, and 3.3.

- Remove dependence on pep8/pycodestyle for file processing, plugin
  dispatching, and more. We now control all of this while keeping backwards
  compatibility.

- ``--select`` and ``--ignore`` can now both be specified and try to find the
  most specific rule from each. For example, if you do ``--select E --ignore
  E123`` then we will report everything that starts with ``E`` except for
  ``E123``. Previously, you would have had to do ``--ignore E123,F,W`` which
  will also still work, but the former should be far more intuitive.

- Add support for in-line ``# noqa`` comments to specify **only** the error
  codes to be ignored, e.g., ``# noqa: E123,W503``

- Add entry-point for formatters as well as a base class that new formatters
  can inherit from. See the documentation for more details.

- Add detailed verbose output using the standard library logging module.

- Enhance our usage of optparse for plugin developers by adding new parameters
  to the ``add_option`` that plugins use to register new options.

- Update ``--install-hook`` to require the name of version control system hook
  you wish to install a Flake8.

- Stop checking sub-directories more than once via the setuptools command

- When passing a file on standard-in, allow the caller to specify
  ``--stdin-display-name`` so the output is properly formatted

- The Git hook now uses ``sys.executable`` to format the shebang line.
  This allows Flake8 to install a hook script from a virtualenv that points to
  that virtualenv's Flake8 as opposed to a global one (without the virtualenv
  being sourced).

- Print results in a deterministic and consistent ordering when used with
  multiprocessing

- When using ``--count``, the output is no longer written to stderr.

- AST plugins can either be functions or classes and all plugins can now
  register options so long as there are callable attributes named as we
  expect.
3.0.1 -- 2016-07-25
-------------------

- Fix regression in handling of ``# noqa`` for multiline strings.
  (See also `GitLab#177`_)

- Fix regression in handling of ``--output-file`` when not also using
  ``--verbose``. (See also `GitLab#180`_)

- Fix regression in handling of ``--quiet``. (See also `GitLab#180`_)

- Fix regression in handling of ``--statistics``. (See also `GitLab#180`_)


3.0.2 -- 2016-07-26
-------------------

- Fix local config file discovery.  (See also `GitLab#181`_)

- Fix indexing of column numbers. We accidentally were starting column indices
  at 0 instead of 1.

- Fix regression in handling of errors like E402 that rely on a combination of
  attributes. (See also `GitLab#186`_)


3.0.3 -- 2016-07-30
-------------------

- Disable ``--jobs`` for any version of Python on Windows.
  (See also `this Python bug report`_)

- Raise exception when entry_point in plugin not callable.
  This raises an informative error when a plugin fails to load because its
  entry_point is not callable, which can happen with a plugin which is buggy or
  not updated for the current version of flake8. This is nicer than raising a
  `PicklingError` about failing to pickle a module (See also `GitLab#164`_)

- Fix ``# noqa`` comments followed by a ``:`` and explanation broken by
  3.0.0 (See also `GitLab#178`_)

- Always open our output file in append mode so we do not overwrite log
  messages. (See also `GitLab#193`_)

- When normalizing path values read from configuration, keep in context the
  directory where the configuration was found so that relative paths work.
  (See also `GitLab#194`_)

- Fix issue where users were unable to ignore plugin errors that were on
  by default. (See also `GitLab#195`_)

- Fix our legacy API StyleGuide's ``init_report`` method to actually override
  the previous formatter. (See also `GitLab#200`_)

3.0.4 -- 2016-08-08
-------------------

- Side-step a Pickling Error when using Flake8 with multiprocessing on Unix
  systems. (See also `GitLab#164`_)

- Fix an Attribute Error raised when dealing with Invalid Syntax. (See also
  `GitLab#203`_)

- Fix an unhandled Syntax Error when tokenizing files. (See also
  `GitLab#205`_)

4 files changed, 125 insertions, 37 deletions

diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index ee9c75b8250..3e6f6a7c9c3 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/09/30 10:41:06 wiz Exp $
 
-DISTNAME=	flake8-2.2.5
+DISTNAME=	flake8-3.0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/flake8/}
@@ -12,8 +12,16 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-flakes>=0.8.1:../../devel/py-flakes
 DEPENDS+=	${PYPKGPREFIX}-mccabe-[0-9]*:../../devel/py-mccabe
-DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-DEPENDS+=	${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8
+DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+DEPENDS+=	${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
+DEPENDS+=	${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+
+# TEST_DEPENDS
+# 8 test failures as of 3.0.4, see
+# https://gitlab.com/pycqa/flake8/issues/232
+BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/flake8 ${DESTDIR}${PREFIX}/bin/flake8-${PYVERSSUFFIX}
diff --git a/devel/py-flake8/PLIST b/devel/py-flake8/PLIST
index 841f02dc584..c7059560b15 100644
--- a/devel/py-flake8/PLIST
+++ b/devel/py-flake8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/01/03 00:05:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/30 10:41:06 wiz Exp $
 bin/flake8-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -12,30 +12,90 @@ ${PYSITELIB}/flake8/__init__.pyo
 ${PYSITELIB}/flake8/__main__.py
 ${PYSITELIB}/flake8/__main__.pyc
 ${PYSITELIB}/flake8/__main__.pyo
-${PYSITELIB}/flake8/_pyflakes.py
-${PYSITELIB}/flake8/_pyflakes.pyc
-${PYSITELIB}/flake8/_pyflakes.pyo
-${PYSITELIB}/flake8/engine.py
-${PYSITELIB}/flake8/engine.pyc
-${PYSITELIB}/flake8/engine.pyo
-${PYSITELIB}/flake8/hooks.py
-${PYSITELIB}/flake8/hooks.pyc
-${PYSITELIB}/flake8/hooks.pyo
-${PYSITELIB}/flake8/main.py
-${PYSITELIB}/flake8/main.pyc
-${PYSITELIB}/flake8/main.pyo
-${PYSITELIB}/flake8/reporter.py
-${PYSITELIB}/flake8/reporter.pyc
-${PYSITELIB}/flake8/reporter.pyo
-${PYSITELIB}/flake8/run.py
-${PYSITELIB}/flake8/run.pyc
-${PYSITELIB}/flake8/run.pyo
-${PYSITELIB}/flake8/tests/__init__.py
-${PYSITELIB}/flake8/tests/__init__.pyc
-${PYSITELIB}/flake8/tests/__init__.pyo
-${PYSITELIB}/flake8/tests/test_engine.py
-${PYSITELIB}/flake8/tests/test_engine.pyc
-${PYSITELIB}/flake8/tests/test_engine.pyo
-${PYSITELIB}/flake8/util.py
-${PYSITELIB}/flake8/util.pyc
-${PYSITELIB}/flake8/util.pyo
+${PYSITELIB}/flake8/api/__init__.py
+${PYSITELIB}/flake8/api/__init__.pyc
+${PYSITELIB}/flake8/api/__init__.pyo
+${PYSITELIB}/flake8/api/legacy.py
+${PYSITELIB}/flake8/api/legacy.pyc
+${PYSITELIB}/flake8/api/legacy.pyo
+${PYSITELIB}/flake8/checker.py
+${PYSITELIB}/flake8/checker.pyc
+${PYSITELIB}/flake8/checker.pyo
+${PYSITELIB}/flake8/defaults.py
+${PYSITELIB}/flake8/defaults.pyc
+${PYSITELIB}/flake8/defaults.pyo
+${PYSITELIB}/flake8/exceptions.py
+${PYSITELIB}/flake8/exceptions.pyc
+${PYSITELIB}/flake8/exceptions.pyo
+${PYSITELIB}/flake8/formatting/__init__.py
+${PYSITELIB}/flake8/formatting/__init__.pyc
+${PYSITELIB}/flake8/formatting/__init__.pyo
+${PYSITELIB}/flake8/formatting/base.py
+${PYSITELIB}/flake8/formatting/base.pyc
+${PYSITELIB}/flake8/formatting/base.pyo
+${PYSITELIB}/flake8/formatting/default.py
+${PYSITELIB}/flake8/formatting/default.pyc
+${PYSITELIB}/flake8/formatting/default.pyo
+${PYSITELIB}/flake8/main/__init__.py
+${PYSITELIB}/flake8/main/__init__.pyc
+${PYSITELIB}/flake8/main/__init__.pyo
+${PYSITELIB}/flake8/main/application.py
+${PYSITELIB}/flake8/main/application.pyc
+${PYSITELIB}/flake8/main/application.pyo
+${PYSITELIB}/flake8/main/cli.py
+${PYSITELIB}/flake8/main/cli.pyc
+${PYSITELIB}/flake8/main/cli.pyo
+${PYSITELIB}/flake8/main/git.py
+${PYSITELIB}/flake8/main/git.pyc
+${PYSITELIB}/flake8/main/git.pyo
+${PYSITELIB}/flake8/main/mercurial.py
+${PYSITELIB}/flake8/main/mercurial.pyc
+${PYSITELIB}/flake8/main/mercurial.pyo
+${PYSITELIB}/flake8/main/options.py
+${PYSITELIB}/flake8/main/options.pyc
+${PYSITELIB}/flake8/main/options.pyo
+${PYSITELIB}/flake8/main/setuptools_command.py
+${PYSITELIB}/flake8/main/setuptools_command.pyc
+${PYSITELIB}/flake8/main/setuptools_command.pyo
+${PYSITELIB}/flake8/main/vcs.py
+${PYSITELIB}/flake8/main/vcs.pyc
+${PYSITELIB}/flake8/main/vcs.pyo
+${PYSITELIB}/flake8/options/__init__.py
+${PYSITELIB}/flake8/options/__init__.pyc
+${PYSITELIB}/flake8/options/__init__.pyo
+${PYSITELIB}/flake8/options/aggregator.py
+${PYSITELIB}/flake8/options/aggregator.pyc
+${PYSITELIB}/flake8/options/aggregator.pyo
+${PYSITELIB}/flake8/options/config.py
+${PYSITELIB}/flake8/options/config.pyc
+${PYSITELIB}/flake8/options/config.pyo
+${PYSITELIB}/flake8/options/manager.py
+${PYSITELIB}/flake8/options/manager.pyc
+${PYSITELIB}/flake8/options/manager.pyo
+${PYSITELIB}/flake8/plugins/__init__.py
+${PYSITELIB}/flake8/plugins/__init__.pyc
+${PYSITELIB}/flake8/plugins/__init__.pyo
+${PYSITELIB}/flake8/plugins/_trie.py
+${PYSITELIB}/flake8/plugins/_trie.pyc
+${PYSITELIB}/flake8/plugins/_trie.pyo
+${PYSITELIB}/flake8/plugins/manager.py
+${PYSITELIB}/flake8/plugins/manager.pyc
+${PYSITELIB}/flake8/plugins/manager.pyo
+${PYSITELIB}/flake8/plugins/notifier.py
+${PYSITELIB}/flake8/plugins/notifier.pyc
+${PYSITELIB}/flake8/plugins/notifier.pyo
+${PYSITELIB}/flake8/plugins/pyflakes.py
+${PYSITELIB}/flake8/plugins/pyflakes.pyc
+${PYSITELIB}/flake8/plugins/pyflakes.pyo
+${PYSITELIB}/flake8/processor.py
+${PYSITELIB}/flake8/processor.pyc
+${PYSITELIB}/flake8/processor.pyo
+${PYSITELIB}/flake8/statistics.py
+${PYSITELIB}/flake8/statistics.pyc
+${PYSITELIB}/flake8/statistics.pyo
+${PYSITELIB}/flake8/style_guide.py
+${PYSITELIB}/flake8/style_guide.pyc
+${PYSITELIB}/flake8/style_guide.pyo
+${PYSITELIB}/flake8/utils.py
+${PYSITELIB}/flake8/utils.pyc
+${PYSITELIB}/flake8/utils.pyo
diff --git a/devel/py-flake8/distinfo b/devel/py-flake8/distinfo
index 056dd86a0c3..173c48e5ce3 100644
--- a/devel/py-flake8/distinfo
+++ b/devel/py-flake8/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:29:07 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/09/30 10:41:06 wiz Exp $
 
-SHA1 (flake8-2.2.5.tar.gz) = 255f6f5d1c06c52c833584ab6cf3c9ef867f1a4c
-RMD160 (flake8-2.2.5.tar.gz) = 8171f0887905feccdf743e2443040ebc3a5c9ee2
-SHA512 (flake8-2.2.5.tar.gz) = fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee
-Size (flake8-2.2.5.tar.gz) = 28333 bytes
+SHA1 (flake8-3.0.4.tar.gz) = 9bc2e8f7d3b418c1a581fe79e69b820e04aa078c
+RMD160 (flake8-3.0.4.tar.gz) = 3309ac3a738425046bdd54acbf9fc8710dad8173
+SHA512 (flake8-3.0.4.tar.gz) = 845b38824112edfc8244f6ec795b5659f99b4e8171af5e6c737f345e5a429f7b26f57e24ccc42fa2d8117b7ceff4dd100fe840064260fa17f203804e4b83ab06
+Size (flake8-3.0.4.tar.gz) = 1382588 bytes
+SHA1 (patch-setup.cfg) = 4ad1b673d323dc30dfa3334f797bb79d38f1845d
diff --git a/devel/py-flake8/patches/patch-setup.cfg b/devel/py-flake8/patches/patch-setup.cfg
new file mode 100644
index 00000000000..7a70108f5e3
--- /dev/null
+++ b/devel/py-flake8/patches/patch-setup.cfg
@@ -0,0 +1,19 @@
+$NetBSD: patch-setup.cfg,v 1.1 2016/09/30 10:41:06 wiz Exp $
+
+Rename section so it is not picked up by accident, see
+https://github.com/pytest-dev/pytest/issues/567
+
+Bug report:
+https://gitlab.com/pycqa/flake8/issues/231
+
+--- setup.cfg.orig	2016-08-08 10:37:09.000000000 +0000
++++ setup.cfg
+@@ -12,7 +12,7 @@ requires-dist = 
+ 	pycodestyle >= 2.0.0, < 2.1.0
+ 	mccabe >= 0.5.0, < 0.6.0
+ 
+-[pytest]
++[tool:pytest]
+ norecursedirs = .git .* *.egg* old docs dist build
+ addopts = -rw
+