[Python-modules-commits] [python-flake8] 02/03: 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 e8405d8bdcc4f0bc9d88142788898dbe8b09e6c5
Merge: c07cde5 92b64a0
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Fri May 13 14:46:16 2016 -0400

    merge patched into master

 debian/.git-dpm                              |  4 ++--
 debian/patches/update-pyflakes-version.patch | 14 ++++++--------
 flake8.egg-info/requires.txt                 |  2 +-
 setup.py                                     |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index d77d1eb,0000000..e9a0d65
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
- 9e546ef2c37294d3f04b639491d0e06a9dddba48
- 9e546ef2c37294d3f04b639491d0e06a9dddba48
++92b64a0f0c7ef81e48dad173534273c0c1eaafce
++92b64a0f0c7ef81e48dad173534273c0c1eaafce
 +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/update-pyflakes-version.patch
index 61ee61d,0000000..353e41b
mode 100644,000000..100644
--- a/debian/patches/update-pyflakes-version.patch
+++ b/debian/patches/update-pyflakes-version.patch
@@@ -1,35 -1,0 +1,33 @@@
- From 9e546ef2c37294d3f04b639491d0e06a9dddba48 Mon Sep 17 00:00:00 2001
++From 92b64a0f0c7ef81e48dad173534273c0c1eaafce 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).
- 
- Bug: https://gitlab.com/pycqa/flake8/issues/126
++Subject: Allow for pyflakes 1.2.x (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
++index 766bfe7..7469a85 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
+++pyflakes >= 0.8.1, < 1.3
 + 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
++index fab5e86..8ea54bb 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",
+++        "pyflakes >= 0.8.1, < 1.3",
 +         "pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2",
 +         "mccabe >= 0.2.1, < 0.5",
 +     ],

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