[Python-modules-commits] [python-flake8] 04/05: merge patched into master

[Ondřej Nový]

This is an automated email from the git hooks/post-receive script.

onovy pushed a commit to branch master
in repository python-flake8.

commit 89a6b960b8044f9db5c59b1852dd9314f77fee56
Merge: 79724f4 8e2bdd1
Author: Ondřej Nový <onovy at debian.org>
Date:   Wed Aug 10 17:39:42 2016 +0200

    merge patched into master

 PKG-INFO                                           |  2 +-
 debian/.git-dpm                                    |  6 +--
 debian/patches/0001-Removed-pytest-options.patch   |  2 +-
 .../plugin-development/plugin-parameters.rst       |  6 +++
 docs/source/release-notes/3.0.4.rst                | 20 +++++++++
 docs/source/release-notes/index.rst                |  1 +
 docs/source/user/error-codes.rst                   | 49 ++++++++++++++++++++++
 docs/source/user/index.rst                         |  1 +
 src/flake8.egg-info/PKG-INFO                       |  2 +-
 src/flake8.egg-info/SOURCES.txt                    |  2 +
 src/flake8/__init__.py                             |  2 +-
 src/flake8/checker.py                              | 48 +++++++++++----------
 src/flake8/exceptions.py                           | 21 ++++++----
 src/flake8/plugins/manager.py                      | 24 +++++++++++
 src/flake8/plugins/pyflakes.py                     |  3 ++
 src/flake8/processor.py                            | 14 ++-----
 tests/integration/test_checker.py                  |  6 ++-
 tests/unit/test_checker_manager.py                 |  8 +++-
 18 files changed, 167 insertions(+), 50 deletions(-)

diff --cc debian/.git-dpm
index fa9e47e,0000000..2bd6129
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0e497bad2bbb72446e4875447c984d1a67ec7f58
- 0e497bad2bbb72446e4875447c984d1a67ec7f58
- 7551f2be03bc42dce0020386ca41c9af4a9ab45f
++8e2bdd13cbab0bc108f336587c3599905e9d726a
++8e2bdd13cbab0bc108f336587c3599905e9d726a
++a7766c12080ab8db65aa9a24ff3b249035cf132d
 +a7766c12080ab8db65aa9a24ff3b249035cf132d
 +python-flake8_3.0.4+dfsg1.orig.tar.gz
 +d89877daa9197f296ab687f1ca8305a47eeb16c1
 +122292
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-pytest-options.patch
index 2c23e56,0000000..8fff949
mode 100644,000000..100644
--- a/debian/patches/0001-Removed-pytest-options.patch
+++ b/debian/patches/0001-Removed-pytest-options.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 0e497bad2bbb72446e4875447c984d1a67ec7f58 Mon Sep 17 00:00:00 2001
++From 8e2bdd13cbab0bc108f336587c3599905e9d726a Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
 +Date: Sun, 7 Aug 2016 23:48:45 +0200
 +Subject: Removed pytest options
 +
 +---
 + setup.cfg | 4 ----
 + 1 file changed, 4 deletions(-)
 +
 +diff --git a/setup.cfg b/setup.cfg
 +index c32a36a..43d3a45 100644
 +--- a/setup.cfg
 ++++ b/setup.cfg
 +@@ -12,10 +12,6 @@ requires-dist =
 + 	pycodestyle >= 2.0.0, < 2.1.0
 + 	mccabe >= 0.5.0, < 0.6.0
 + 
 +-[pytest]
 +-norecursedirs = .git .* *.egg* old docs dist build
 +-addopts = -rw
 +-
 + [egg_info]
 + tag_build = 
 + tag_date = 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-flake8.git