[Python-modules-commits] [python-flake8] 04/10: merge patched-experimental into experimental
Ondřej Nový
onovy at moszumanska.debian.org
Sat Apr 8 16:02:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-flake8.
commit ee56dbdde0f6e5e8c04d3b203de1c00425250dcc
Merge: 8dfc100 b5475f8
Author: Ondřej Nový <onovy at debian.org>
Date: Tue Feb 21 10:39:53 2017 +0100
merge patched-experimental into experimental
CONTRIBUTING.rst | 2 +
CONTRIBUTORS.txt | 1 +
PKG-INFO | 4 +-
debian/.git-dpm | 6 +-
...per-constrains-from-upstream-requirements.patch | 32 +--
docs/source/internal/.keep | 0
docs/source/internal/contributing.rst | 2 +
docs/source/internal/index.rst | 1 +
docs/source/internal/writing-code.rst | 220 ++++++++++++++++++++
docs/source/manpage.rst | 2 +-
docs/source/plugin-development/.keep | 0
docs/source/release-notes/3.3.0.rst | 57 ++++++
docs/source/release-notes/index.rst | 1 +
docs/source/requirements.txt | 5 -
docs/source/user/.keep | 0
docs/source/user/error-codes.rst | 34 +++-
setup.cfg | 5 +-
setup.py | 10 +-
src/flake8.egg-info/PKG-INFO | 4 +-
src/flake8.egg-info/SOURCES.txt | 8 +-
src/flake8.egg-info/requires.txt | 6 +-
src/flake8/__init__.py | 2 +-
src/flake8/checker.py | 225 +++++++++------------
src/flake8/formatting/base.py | 18 ++
src/flake8/main/application.py | 14 +-
src/flake8/main/git.py | 24 ++-
src/flake8/main/mercurial.py | 5 +-
src/flake8/main/options.py | 2 +-
src/flake8/main/setuptools_command.py | 10 +-
src/flake8/options/manager.py | 2 +-
src/flake8/plugins/pyflakes.py | 51 +++--
src/flake8/processor.py | 1 +
src/flake8/style_guide.py | 8 +
tests/integration/test_checker.py | 1 +
tests/unit/test_checker_manager.py | 4 +-
tests/unit/test_file_processor.py | 2 +-
tests/unit/test_option_manager.py | 17 ++
tests/unit/test_pyflakes_codes.py | 15 ++
tests/unit/test_setuptools_command.py | 34 ++++
tox.ini | 10 +-
40 files changed, 639 insertions(+), 206 deletions(-)
diff --cc debian/.git-dpm
index 8a0184e,0000000..e2a090d
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
- 8e6ad774b40ba028765fdf29abe27e8809d5c40f
- 8e6ad774b40ba028765fdf29abe27e8809d5c40f
- 2025f93ae018835459c660a7c435557694642afc
++b5475f8925a960108ce9acf63517c63d445b2b1d
++b5475f8925a960108ce9acf63517c63d445b2b1d
++2d696618b181dcd3940e8ed0daa44e3e30529686
+2d696618b181dcd3940e8ed0daa44e3e30529686
+python-flake8_3.3.0.orig.tar.gz
+12e0efd6f0cdaf877ba58c7c03a47cd0710666e2
+134345
+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 439817c,0000000..65e897b
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 8e6ad774b40ba028765fdf29abe27e8809d5c40f Mon Sep 17 00:00:00 2001
++From b5475f8925a960108ce9acf63517c63d445b2b1d 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 9c4111e..c3d8925 100644
++index de6418f..913fd74 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.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
++- pyflakes >= 1.5.0, < 1.6.0
++- pycodestyle >= 2.0.0, < 2.4.0
++- mccabe >= 0.6.0, < 0.7.0
+++ pyflakes >= 1.5.0
++ pycodestyle >= 2.0.0
- + mccabe >= 0.5.0
+++ mccabe >= 0.6.0
+
+ [egg_info]
+ tag_build =
+diff --git a/setup.py b/setup.py
- index dc346e1..5642186 100644
++index 5a40d9b..73e00c4 100644
+--- a/setup.py
++++ b/setup.py
- @@ -15,9 +15,9 @@ import flake8
- tests_require = ['mock', 'pytest']
-
++@@ -17,9 +17,9 @@ tests_require = ['mock >= 2.0.0', 'pytest']
++ # NOTE(sigmavirus24): When updating these requirements, update them in
++ # setup.cfg as well.
+ requires = [
- - "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",
++- "pyflakes >= 1.5.0, < 1.6.0",
++- "pycodestyle >= 2.0.0, < 2.4.0",
++- "mccabe >= 0.6.0, < 0.7.0",
+++ "pyflakes >= 1.5.0",
++ "pycodestyle >= 2.0.0",
- + "mccabe >= 0.5.0",
+++ "mccabe >= 0.6.0",
+ ]
+
+ if sys.version_info < (3, 4):
--
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