[Python-modules-commits] [vine] 03/08: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository vine.

commit 6b103c509e465178b72ae060dfd264fb85cd116e
Merge: aff49b2 a890553
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Thu Feb 16 19:09:23 2017 +0000

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../patches/0002-Add-test_suite-to-setup.py.patch   | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 setup.py                                            |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index d04f2d9,0000000..3a3251a
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
- 0b73c823ff5ae3cf55ee8505461995978019b30d
- 0b73c823ff5ae3cf55ee8505461995978019b30d
++a8905538937ea249a7eb2fcc26fbc056d70b5327
++a8905538937ea249a7eb2fcc26fbc056d70b5327
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +vine_1.1.3+dfsg.orig.tar.gz
 +b80f204c4f5e18d01e1c85974a15354f1b330f06
 +49282
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Add-test_suite-to-setup.py.patch
index 0000000,0000000..b657a0c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Add-test_suite-to-setup.py.patch
@@@ -1,0 -1,0 +1,21 @@@
++From a8905538937ea249a7eb2fcc26fbc056d70b5327 Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <mans0954 at debian.org>
++Date: Thu, 16 Feb 2017 19:08:46 +0000
++Subject: Add test_suite to setup.py
++
++---
++ setup.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/setup.py b/setup.py
++index 481f16d..7a9d532 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -109,6 +109,7 @@ setuptools.setup(
++     license='BSD',
++     install_requires=[],
++     tests_require=reqs('test.txt'),
+++    test_suite = 't/unit',
++     cmdclass={'test': pytest},
++     zip_safe=False,
++     include_package_data=False,
diff --cc debian/patches/series
index c13357b,0000000..66bc464
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-image-from-remote-donation-site-privacy-issue.patch
++0002-Add-test_suite-to-setup.py.patch

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