[Python-modules-commits] [python-flake8] 02/03: 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 cd26f28e2f4c90ec2576fa53046ecbd9b4f16130
Merge: 9a09e65 2e732f0
Author: Ondřej Nový <onovy at debian.org>
Date:   Thu Nov 3 21:44:07 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...per-constrains-from-upstream-requirements.patch | 44 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.cfg                                          |  6 +--
 setup.py                                           |  6 +--
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 2bd6129,0000000..d389ef0
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
- 8e2bdd13cbab0bc108f336587c3599905e9d726a
- 8e2bdd13cbab0bc108f336587c3599905e9d726a
++2e732f03667a0ee4bff1d9faf1f432cf294e0654
++2e732f03667a0ee4bff1d9faf1f432cf294e0654
 +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/0002-Remove-upper-constrains-from-upstream-requirements.patch
index 0000000,0000000..b63466f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Remove-upper-constrains-from-upstream-requirements.patch
@@@ -1,0 -1,0 +1,44 @@@
++From 2e732f03667a0ee4bff1d9faf1f432cf294e0654 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
++--- 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
++-	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
++--- 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",
++-    "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 f776795,0000000..90b3311
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Removed-pytest-options.patch
++0002-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