[Python-modules-commits] [pytest-pylint] 05/05: merge patched into master

[Ondrej Koblizek]

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

kobla-guest pushed a commit to branch master
in repository pytest-pylint.

commit e48339bc53d910a2c723fb613b3e1f51e80f160b
Merge: aeda1e4 cb95bb9
Author: Ondrej Koblizek <ondrej.koblizek at firma.seznam.cz>
Date:   Fri May 27 16:38:12 2016 +0200

    merge patched into master

 debian/.git-dpm                                       |  4 ++--
 debian/patches/0001-Removed-PEP8-py.test-plugin.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 tox.ini                                               |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index b22bd99,0000000..5566431
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
- 4255b62161c937e3b91a634994b230cf1ad1820c
- 4255b62161c937e3b91a634994b230cf1ad1820c
++cb95bb930585fd49cb4a5559b67c959f9717fd25
++cb95bb930585fd49cb4a5559b67c959f9717fd25
 +4255b62161c937e3b91a634994b230cf1ad1820c
 +4255b62161c937e3b91a634994b230cf1ad1820c
 +pytest-pylint_0.5.0.orig.tar.gz
 +d7cc8f19898b7590efbd33e2f266191a6e014dd1
 +4971
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-PEP8-py.test-plugin.patch
index 0000000,0000000..0a4b633
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Removed-PEP8-py.test-plugin.patch
@@@ -1,0 -1,0 +1,19 @@@
++From cb95bb930585fd49cb4a5559b67c959f9717fd25 Mon Sep 17 00:00:00 2001
++From: Ondrej Koblizek <ondrej.koblizek at firma.seznam.cz>
++Date: Fri, 27 May 2016 16:38:02 +0200
++Subject: Removed PEP8 py.test plugin
++
++---
++ tox.ini | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/tox.ini b/tox.ini
++index 562e09a..2a64b43 100644
++--- a/tox.ini
+++++ b/tox.ini
++@@ -15,4 +15,4 @@ commands =
++     coverage html -d htmlcov
++ 
++ [pytest]
++-addopts = --pylint --pep8
+++addopts = --pylint
diff --cc debian/patches/series
index 0000000,0000000..5d3e236
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Removed-PEP8-py.test-plugin.patch

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