[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 tag debian/3.2.1-1
in repository python-flake8.

commit e750b37f29bbcc52bb4b6a03b0a8be7ac3b99b48
Merge: 2df4b1a 8e6ad77
Author: Ondřej Nový <onovy at debian.org>
Date:   Fri Nov 25 20:01:27 2016 +0100

    merge patched into master

 CONTRIBUTING.rst                                   |  2 +-
 PKG-INFO                                           |  2 +-
 debian/.git-dpm                                    |  6 +--
 ...per-constrains-from-upstream-requirements.patch |  2 +-
 docs/source/internal/contributing.rst              |  2 +-
 docs/source/release-notes/3.1.0.rst                |  4 +-
 docs/source/release-notes/3.2.0.rst                |  2 +-
 docs/source/release-notes/3.2.1.rst                | 27 ++++++++++
 docs/source/release-notes/index.rst                |  1 +
 src/flake8.egg-info/PKG-INFO                       |  2 +-
 src/flake8.egg-info/SOURCES.txt                    |  1 +
 src/flake8/__init__.py                             |  2 +-
 src/flake8/checker.py                              | 40 +++++++++------
 src/flake8/defaults.py                             | 25 +++++++--
 src/flake8/main/options.py                         |  6 +--
 src/flake8/style_guide.py                          | 60 ++++++++++++++--------
 tests/unit/test_style_guide.py                     | 47 +++++++++++++++++
 17 files changed, 175 insertions(+), 56 deletions(-)

diff --cc debian/.git-dpm
index adcf694,0000000..cb92aa3
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
- ec79bfbce9a1cd8273ce80678d1ade729f89e4b8
- ec79bfbce9a1cd8273ce80678d1ade729f89e4b8
- c959f8a48c6ec635e8cb8d443d232003265a750e
++8e6ad774b40ba028765fdf29abe27e8809d5c40f
++8e6ad774b40ba028765fdf29abe27e8809d5c40f
++2025f93ae018835459c660a7c435557694642afc
 +2025f93ae018835459c660a7c435557694642afc
 +python-flake8_3.2.1.orig.tar.gz
 +bf42a3009ae3f5cb5cd4ea54b959dbd79f85dd4f
 +129458
 +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 4cb32f8,0000000..439817c
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 ec79bfbce9a1cd8273ce80678d1ade729f89e4b8 Mon Sep 17 00:00:00 2001
++From 8e6ad774b40ba028765fdf29abe27e8809d5c40f 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
 +--- 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
 ++	pycodestyle >= 2.0.0
 ++	mccabe >= 0.5.0
 + 
 + [egg_info]
 + tag_build = 
 +diff --git a/setup.py b/setup.py
 +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.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):

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