[Python-modules-commits] [python-flake8] 02/12: 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 f1271a790f9d4386c9b07f61ca6ccb0bcd67d9fa
Merge: 1c11725 9c14022
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Aug 7 23:48:56 2016 +0200

    merge patched into master

 debian/.git-dpm                                  |  4 ++--
 debian/patches/0001-Removed-pytest-options.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 setup.cfg                                        |  4 ----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 4d56227,0000000..21acdaf
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
- cab28e68534685d9e6296ac5040b0fc2b6df08ce
- cab28e68534685d9e6296ac5040b0fc2b6df08ce
++9c140228a3885d190b23240b871fa31c77c48717
++9c140228a3885d190b23240b871fa31c77c48717
 +cab28e68534685d9e6296ac5040b0fc2b6df08ce
 +cab28e68534685d9e6296ac5040b0fc2b6df08ce
 +python-flake8_3.0.3.orig.tar.gz
 +3095823f4f00e67fe70c5e0cda6a54f598167891
 +1373604
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-pytest-options.patch
index 0000000,0000000..c8ee15e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Removed-pytest-options.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 9c140228a3885d190b23240b871fa31c77c48717 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 7 Aug 2016 23:48:45 +0200
++Subject: Removed pytest options
++
++---
++ setup.cfg | 4 ----
++ 1 file changed, 4 deletions(-)
++
++diff --git a/setup.cfg b/setup.cfg
++index c32a36a..43d3a45 100644
++--- a/setup.cfg
+++++ b/setup.cfg
++@@ -12,10 +12,6 @@ requires-dist =
++ 	pycodestyle >= 2.0.0, < 2.1.0
++ 	mccabe >= 0.5.0, < 0.6.0
++ 
++-[pytest]
++-norecursedirs = .git .* *.egg* old docs dist build
++-addopts = -rw
++-
++ [egg_info]
++ tag_build = 
++ tag_date = 0
diff --cc debian/patches/series
index 0000000,0000000..f776795
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Removed-pytest-options.patch

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