[Python-modules-commits] [pytest-pylint] 04/08: 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 f9d730ed53f97c965fa675c302efe8dd1130aa95
Merge: 5931db5 92815c8
Author: Ondřej Kobližek <ondrej.koblizek at firma.seznam.cz>
Date:   Wed Feb 7 11:56:23 2018 +0100

    merge patched into master

 .travis.yml                                        |  1 -
 README.rst                                         |  6 ++++
 debian/.git-dpm                                    |  6 ++--
 ...consistent-return-statements-pylint-error.patch | 42 ----------------------
 .../patches/0001-Removed-PEP8-py.test-plugin.patch |  4 +--
 debian/patches/series                              |  1 -
 pytest_pylint.py                                   |  5 +--
 setup.py                                           |  7 ++--
 tox.ini                                            |  2 +-
 9 files changed, 19 insertions(+), 55 deletions(-)

diff --cc debian/.git-dpm
index d4ec1a4,0000000..e637ad8
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
- 87bfde7a963e459042793e4f6d3ba49d4e2681f0
- 87bfde7a963e459042793e4f6d3ba49d4e2681f0
- dfff20c4c1d63e1160a845b2390009c5e2b62fcb
++92815c82aad21121fba460ee7d0840cd47d847b9
++92815c82aad21121fba460ee7d0840cd47d847b9
++06cff8f1d012efc3f52c941122086538bcd7b1fa
 +06cff8f1d012efc3f52c941122086538bcd7b1fa
 +pytest-pylint_0.8.0.orig.tar.gz
 +1c1efc22fd31d6c892b248e64f730875b5e80455
 +5706
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-PEP8-py.test-plugin.patch
index 9e9bbbb,0000000..ce33b77
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 87bfde7a963e459042793e4f6d3ba49d4e2681f0 Mon Sep 17 00:00:00 2001
++From 92815c82aad21121fba460ee7d0840cd47d847b9 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 34f73d9..4fe231c 100644
++index 63c5ae6..91b6e5e 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 e87e26e,0000000..5d3e236
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +0001-Removed-PEP8-py.test-plugin.patch
- 0001-Fix-inconsistent-return-statements-pylint-error.patch

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