[Python-modules-commits] [pytest-pylint] 05/10: 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 e38c61a0c441fa0c3d7e51323915f286c1c72e16
Merge: b105cff 87bfde7
Author: Ondřej Kobližek <koblizeko at gmail.com>
Date:   Thu Jul 20 14:43:57 2017 +0200

    merge patched into master

 .gitignore                                         |   3 +
 .travis.yml                                        |   7 +-
 README.rst                                         |  15 +++
 debian/.git-dpm                                    |   6 +-
 .../patches/0001-Removed-PEP8-py.test-plugin.patch |   4 +-
 pytest_pylint.py                                   | 124 ++++++++++++++-------
 setup.py                                           |   2 +-
 test_pytest_pylint.py                              |  16 ++-
 tox.ini                                            |   2 +-
 9 files changed, 131 insertions(+), 48 deletions(-)

diff --cc debian/.git-dpm
index 85750f7,0000000..bc9eacc
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
- e7f7e6fd01c9bfad939c5fb02714491041deb084
- e7f7e6fd01c9bfad939c5fb02714491041deb084
- a09d1a4d6eaca2155a7cb8e737b0cb85fc1bfb46
++87bfde7a963e459042793e4f6d3ba49d4e2681f0
++87bfde7a963e459042793e4f6d3ba49d4e2681f0
++dfff20c4c1d63e1160a845b2390009c5e2b62fcb
 +dfff20c4c1d63e1160a845b2390009c5e2b62fcb
 +pytest-pylint_0.7.1.orig.tar.gz
 +7a2f4c90651be5a3e7923de37e08ad1dacc1a0e1
 +5648
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-PEP8-py.test-plugin.patch
index ca54736,0000000..9e9bbbb
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 e7f7e6fd01c9bfad939c5fb02714491041deb084 Mon Sep 17 00:00:00 2001
++From 87bfde7a963e459042793e4f6d3ba49d4e2681f0 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
++index 34f73d9..4fe231c 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