[Python-modules-commits] [python-flake8] 02/07: merge patched into master

[Barry Warsaw]

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

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

commit 1a939477c478c00557c1eea532c673e36fe273c0
Merge: 352a7a0 06125ff
Author: Barry Warsaw <barry at python.org>
Date:   Mon Mar 14 13:33:36 2016 -0400

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0001-Allow-for-pyflakes-1.1-in-Debian.patch    | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 flake8.egg-info/requires.txt                       |  2 +-
 setup.py                                           |  2 +-
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 48ce748,0000000..e9f1365
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
- 5a9c8328c6584d2a2b1b0f34b1150711b716189e
- 5a9c8328c6584d2a2b1b0f34b1150711b716189e
++06125ffe8e07ac5d70c51aa5011a1b82fb9b87ab
++06125ffe8e07ac5d70c51aa5011a1b82fb9b87ab
 +5a9c8328c6584d2a2b1b0f34b1150711b716189e
 +5a9c8328c6584d2a2b1b0f34b1150711b716189e
 +python-flake8_2.5.4.orig.tar.gz
 +778b32ee00738628f28b061a93427fe9e23eb7f0
 +81663
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Allow-for-pyflakes-1.1-in-Debian.patch
index 0000000,0000000..f409ef1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Allow-for-pyflakes-1.1-in-Debian.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 06125ffe8e07ac5d70c51aa5011a1b82fb9b87ab Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Mon, 14 Mar 2016 13:32:56 -0400
++Subject: Allow for pyflakes 1.1 (in Debian).
++
++Patch-name: update-pyflakes-version.patch
++---
++ flake8.egg-info/requires.txt | 2 +-
++ setup.py                     | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/flake8.egg-info/requires.txt b/flake8.egg-info/requires.txt
++index 766bfe7..e72aaf1 100644
++--- a/flake8.egg-info/requires.txt
+++++ b/flake8.egg-info/requires.txt
++@@ -1,3 +1,3 @@
++-pyflakes >= 0.8.1, < 1.1
+++pyflakes >= 0.8.1, < 1.2
++ pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2
++ mccabe >= 0.2.1, < 0.5
++diff --git a/setup.py b/setup.py
++index fab5e86..40372e3 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -49,7 +49,7 @@ setup(
++     url="https://gitlab.com/pycqa/flake8",
++     packages=["flake8", "flake8.tests"],
++     install_requires=[
++-        "pyflakes >= 0.8.1, < 1.1",
+++        "pyflakes >= 0.8.1, < 1.2",
++         "pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2",
++         "mccabe >= 0.2.1, < 0.5",
++     ],
diff --cc debian/patches/series
index 0000000,0000000..ca02f59
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Allow-for-pyflakes-1.1-in-Debian.patch

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