[Python-modules-commits] [pytest-pylint] 04/06: 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 e7267540c313d16c2a6b535d343d07e0014a4101
Merge: 67e98fa e7f7e6f
Author: Ondřej Kobližek <ondrej.koblizek at firma.seznam.cz>
Date:   Tue Aug 2 07:07:51 2016 +0200

    merge patched into master

 README.rst                                            | 7 +++++++
 debian/.git-dpm                                       | 6 +++---
 debian/patches/0001-Removed-PEP8-py.test-plugin.patch | 2 +-
 pytest_pylint.py                                      | 2 ++
 setup.py                                              | 4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 41313b8,0000000..6296ab3
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
- cb95bb930585fd49cb4a5559b67c959f9717fd25
- cb95bb930585fd49cb4a5559b67c959f9717fd25
- 4255b62161c937e3b91a634994b230cf1ad1820c
++e7f7e6fd01c9bfad939c5fb02714491041deb084
++e7f7e6fd01c9bfad939c5fb02714491041deb084
++a09d1a4d6eaca2155a7cb8e737b0cb85fc1bfb46
 +a09d1a4d6eaca2155a7cb8e737b0cb85fc1bfb46
 +pytest-pylint_0.6.0.orig.tar.gz
 +e52688b7c5501c0d957df183e35f10777cd679ac
 +5032
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-PEP8-py.test-plugin.patch
index 0a4b633,0000000..ca54736
mode 100644,000000..100644
--- a/debian/patches/0001-Removed-PEP8-py.test-plugin.patch
+++ b/debian/patches/0001-Removed-PEP8-py.test-plugin.patch
@@@ -1,19 -1,0 +1,19 @@@
- From cb95bb930585fd49cb4a5559b67c959f9717fd25 Mon Sep 17 00:00:00 2001
++From e7f7e6fd01c9bfad939c5fb02714491041deb084 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

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