[Python-modules-commits] [pytest-pep8] 09/10: merge patched into master

[Adrian Vondendriesch]

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

discostu-guest pushed a commit to branch master
in repository pytest-pep8.

commit 50e0b062b33177eebccf8d61e954274a3e2d6e87
Merge: 903f780 d557740
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Tue May 30 08:37:23 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-remove-pytest-cached-bump-pytest-version.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 19c2c78,0000000..e392305
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
- f16391f29e89f9b787bbcae171dc61b1d4fef9ca
- f16391f29e89f9b787bbcae171dc61b1d4fef9ca
++d557740c9f4a1d00e0c178d00f546f4ce8ccc72c
++d557740c9f4a1d00e0c178d00f546f4ce8ccc72c
 +f16391f29e89f9b787bbcae171dc61b1d4fef9ca
 +f16391f29e89f9b787bbcae171dc61b1d4fef9ca
 +pytest-pep8_1.0.6.orig.tar.gz
 +f93336b101d908b4c5932f271e68c2c8106144dd
 +7271
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-setup-remove-pytest-cached-bump-pytest-version.patch
index 0000000,0000000..7194c25
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-setup-remove-pytest-cached-bump-pytest-version.patch
@@@ -1,0 -1,0 +1,22 @@@
++From d557740c9f4a1d00e0c178d00f546f4ce8ccc72c Mon Sep 17 00:00:00 2001
++From: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
++Date: Tue, 30 May 2017 08:35:48 +0200
++Subject: setup: remove pytest-cached, bump pytest version.
++
++The pytest-cached plugin was merged into pytest in version 2.8.0. We
++don't longer need to set an explicit requirement to -cached.
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 19af01c..64875aa 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -12,5 +12,5 @@ if __name__ == "__main__":
++         url='http://bitbucket.org/hpk42/pytest-pep8/',
++         py_modules=['pytest_pep8'],
++         entry_points={'pytest11': ['pep8 = pytest_pep8']},
++-        install_requires=['pytest-cache', 'pytest>=2.4.2', 'pep8>=1.3', ],
+++        install_requires=['pytest>=2.8.0', 'pep8>=1.3', ],
++     )
diff --cc debian/patches/series
index 0000000,0000000..51fb7ee
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-setup-remove-pytest-cached-bump-pytest-version.patch

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