[Python-modules-commits] [python-graphviz] 05/06: merge patched into master

[Diane Trout]

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

diane pushed a commit to branch master
in repository python-graphviz.

commit 4518a7235eda2c190fc72b98b7784fef524075b6
Merge: 276a6df 88b5660
Author: Diane Trout <diane at ghic.org>
Date:   Thu Jan 5 17:06:49 2017 -0800

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...t-runs-the-tests-in-a-subdirectory-meanin.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_tools.py                                | 10 ++++++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 6670181,0000000..3f7402f
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
- dc33b7c91a62592c0560a0181aaddebadc3b043e
- dc33b7c91a62592c0560a0181aaddebadc3b043e
++88b56607e29c1ea7efda0fa0635ee754f17e0bd4
++88b56607e29c1ea7efda0fa0635ee754f17e0bd4
 +dc33b7c91a62592c0560a0181aaddebadc3b043e
 +dc33b7c91a62592c0560a0181aaddebadc3b043e
 +python-graphviz_0.5.2.orig.tar.gz
 +224e749ba77cef7efca86c1dc1866400b443f934
 +56789
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-dh_auto_test-runs-the-tests-in-a-subdirectory-meanin.patch
index 0000000,0000000..5851892
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-dh_auto_test-runs-the-tests-in-a-subdirectory-meanin.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 88b56607e29c1ea7efda0fa0635ee754f17e0bd4 Mon Sep 17 00:00:00 2001
++From: Diane Trout <diane at ghic.org>
++Date: Thu, 5 Jan 2017 17:05:15 -0800
++Subject: dh_auto_test runs the tests in a subdirectory, meaning the assumption
++ that there is a setup.py file doesn't apply.
++
++Forwarded: https://github.com/xflr6/graphviz/pull/29
++---
++ tests/test_tools.py | 10 ++++++++++
++ 1 file changed, 10 insertions(+)
++
++diff --git a/tests/test_tools.py b/tests/test_tools.py
++index e280bcf..e7113c6 100644
++--- a/tests/test_tools.py
+++++ b/tests/test_tools.py
++@@ -2,11 +2,21 @@
++ 
++ import unittest2 as unittest
++ import os
+++import stat
++ 
++ from graphviz.tools import mkdirs
++ 
++ 
++ class TestMkdirs(unittest.TestCase):
+++    def setUp(self):
+++        if not os.path.exists('setup.py'):
+++            f = open('setup.py', 'w')
+++            f.close()
+++
+++    def tearDown(self):
+++        info = os.stat('setup.py')
+++        if info.st_size == 0:
+++            os.unlink('setup.py')
++ 
++     @staticmethod
++     def _dirnames(path=os.curdir):
diff --cc debian/patches/series
index 0000000,0000000..841a3f6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-dh_auto_test-runs-the-tests-in-a-subdirectory-meanin.patch

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