[Python-modules-commits] [python-flake8] 04/09: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Thu Nov 17 13:48:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-flake8.
commit 1f180991970982b562d555173b354ef65f799e08
Merge: dd5d21f ec79bfb
Author: Ondřej Nový <onovy at debian.org>
Date: Thu Nov 17 14:22:58 2016 +0100
merge patched into master
CONTRIBUTING.rst | 2 +-
MANIFEST.in | 1 +
PKG-INFO | 4 +-
README.rst | 2 +-
debian/.git-dpm | 6 +-
...er-constrains-from-upstream-requirements.patch} | 14 +-
debian/patches/0001-Removed-pytest-options.patch | 24 --
...revious_unindented_logical_line-attribute.patch | 53 -----
debian/patches/series | 4 +-
docs/source/conf.py | 2 +-
docs/source/index.rst | 1 +
docs/source/internal/cli.rst | 2 +-
docs/source/internal/contributing.rst | 2 +-
docs/source/internal/option_handling.rst | 2 +-
docs/source/manpage.rst | 150 ++++++++++++
.../plugin-development/plugin-parameters.rst | 22 +-
docs/source/release-notes/3.0.0.rst | 14 ++
docs/source/release-notes/3.1.0.rst | 80 +++++++
docs/source/release-notes/3.1.1.rst | 18 ++
docs/source/release-notes/3.2.0.rst | 13 +
docs/source/release-notes/index.rst | 21 ++
docs/source/user/configuration.rst | 7 +-
docs/source/user/error-codes.rst | 3 +
docs/source/user/index.rst | 1 +
docs/source/user/invocation.rst | 1 +
docs/source/user/options.rst | 68 ++++++
docs/source/user/using-hooks.rst | 69 ++++++
pytest.ini | 3 +
setup.py | 1 +
src/flake8.egg-info/PKG-INFO | 4 +-
src/flake8.egg-info/SOURCES.txt | 261 ++-------------------
src/flake8.egg-info/requires.txt | 4 +-
src/flake8/__init__.py | 2 +-
src/flake8/api/legacy.py | 2 +-
src/flake8/checker.py | 43 +++-
src/flake8/formatting/base.py | 2 +-
src/flake8/formatting/default.py | 8 +
src/flake8/main/application.py | 10 +-
src/flake8/main/debug.py | 62 +++++
src/flake8/main/git.py | 26 +-
src/flake8/main/options.py | 17 ++
src/flake8/options/manager.py | 5 +-
src/flake8/plugins/manager.py | 11 +-
src/flake8/plugins/pyflakes.py | 2 +
src/flake8/processor.py | 23 +-
src/flake8/style_guide.py | 47 ++--
tests/fixtures/example-code/invalid-syntax.py | 1 +
tests/unit/test_application.py | 62 +++++
tests/unit/test_base_formatter.py | 18 +-
tests/unit/test_debug.py | 86 +++++++
tests/unit/test_file_checker.py | 25 ++
tests/unit/test_file_processor.py | 12 +
tests/unit/test_filenameonly_formatter.py | 38 +++
tests/unit/test_git.py | 29 +++
tests/unit/test_nothing_formatter.py | 28 +++
tests/unit/test_plugin.py | 25 ++
tests/unit/test_style_guide.py | 56 +++--
tox.ini | 159 +++++++++++++
58 files changed, 1237 insertions(+), 421 deletions(-)
diff --cc debian/.git-dpm
index 4fda4a9,0000000..c8c461a
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
- 8280129e7b083f590df8ef8c11cb75739b8553a4
- 8280129e7b083f590df8ef8c11cb75739b8553a4
- a7766c12080ab8db65aa9a24ff3b249035cf132d
++ec79bfbce9a1cd8273ce80678d1ade729f89e4b8
++ec79bfbce9a1cd8273ce80678d1ade729f89e4b8
++c959f8a48c6ec635e8cb8d443d232003265a750e
+c959f8a48c6ec635e8cb8d443d232003265a750e
+python-flake8_3.2.0.orig.tar.gz
+5f3d2f46e24ede383571405f2572d4d5067b5677
+128662
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-upper-constrains-from-upstream-requirements.patch
index b63466f,0000000..4cb32f8
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-upper-constrains-from-upstream-requirements.patch
+++ b/debian/patches/0001-Remove-upper-constrains-from-upstream-requirements.patch
@@@ -1,44 -1,0 +1,44 @@@
- From 2e732f03667a0ee4bff1d9faf1f432cf294e0654 Mon Sep 17 00:00:00 2001
++From ec79bfbce9a1cd8273ce80678d1ade729f89e4b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
+Date: Thu, 3 Nov 2016 21:43:46 +0100
+Subject: Remove upper constrains from upstream requirements
+
+---
+ setup.cfg | 6 +++---
+ setup.py | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
- index 43d3a45..c3d8925 100644
++index 9c4111e..c3d8925 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -8,9 +8,9 @@ universal = 1
+ requires-dist =
+ enum34; python_version<"3.4"
+ configparser; python_version<"3.2"
- - pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0
- - pycodestyle >= 2.0.0, < 2.1.0
++- pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.4.0
++- pycodestyle >= 2.0.0, < 2.3.0
+- mccabe >= 0.5.0, < 0.6.0
++ pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2
++ pycodestyle >= 2.0.0
++ mccabe >= 0.5.0
+
+ [egg_info]
+ tag_build =
+diff --git a/setup.py b/setup.py
- index d95530c..a5722e5 100644
++index dc346e1..5642186 100644
+--- a/setup.py
++++ b/setup.py
+@@ -15,9 +15,9 @@ import flake8
+ tests_require = ['mock', 'pytest']
+
+ requires = [
- - "pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0",
- - "pycodestyle >= 2.0.0, < 2.1.0",
++- "pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.4.0",
++- "pycodestyle >= 2.0.0, < 2.3.0",
+- "mccabe >= 0.5.0, < 0.6.0",
++ "pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2",
++ "pycodestyle >= 2.0.0",
++ "mccabe >= 0.5.0",
+ ]
+
+ if sys.version_info < (3, 4):
diff --cc debian/patches/series
index 9ae5374,0000000..ef97c03
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
- 0001-Removed-pytest-options.patch
- 0002-Remove-upper-constrains-from-upstream-requirements.patch
- 0003-Add-previous_unindented_logical_line-attribute.patch
++0001-Remove-upper-constrains-from-upstream-requirements.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-flake8.git
More information about the Python-modules-commits
mailing list