[Python-modules-commits] [python-pygraphviz] 06/14: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-pygraphviz.

commit 208358737eb83865b64d2a9b75a79c9b12490440
Merge: 6f8380a dc1fb23
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jan 8 14:42:14 2017 -0500

    merge patched into master

 PKG-INFO                               |   5 +-
 debian/.git-dpm                        |   6 +-
 debian/patches/dont_install_data.patch |   6 +-
 doc/source/conf.py                     |   4 +-
 pygraphviz.egg-info/PKG-INFO           |   5 +-
 pygraphviz.egg-info/SOURCES.txt        |   1 +
 pygraphviz/agraph.py                   |  33 ++--
 pygraphviz/graphviz.i                  |  29 +++-
 pygraphviz/graphviz.py                 | 269 ++++++++++++++++++---------------
 pygraphviz/graphviz_wrap.c             | 159 ++++++++++++++++---
 pygraphviz/release.py                  |   5 +-
 pygraphviz/tests/test_clear.py         |   2 +-
 pygraphviz/tests/test_graph.py         |  21 ++-
 pygraphviz/tests/test_readwrite.py     |  27 ++--
 pygraphviz/tests/test_setup.py         |  51 +++++++
 pygraphviz/version.py                  |   4 +-
 setup.py                               |  11 +-
 setup_commands.py                      |   8 +-
 setup_extra.py                         |  74 ++++++---
 tox.ini                                |   9 +-
 20 files changed, 500 insertions(+), 229 deletions(-)

diff --cc debian/.git-dpm
index 1669bd8,0000000..4b2970d
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
- 2ede535d2e2d7ea31f47e0cd55efd74fb3c59da2
- 2ede535d2e2d7ea31f47e0cd55efd74fb3c59da2
- 52fefaeba987b9d80c1473e9431c06b160ea3af4
++dc1fb232af3bbb571ffc41719d1beb56f1e3d8e8
++dc1fb232af3bbb571ffc41719d1beb56f1e3d8e8
++4df25c6adda75c2c513e2ff8d8187be21e35bac6
 +4df25c6adda75c2c513e2ff8d8187be21e35bac6
 +python-pygraphviz_1.4~rc1.orig.tar.gz
 +7ba885204d452135b8527c59243155f89cacf134
 +105374
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/dont_install_data.patch
index 3f44e41,0000000..b37c8aa
mode 100644,000000..100644
--- a/debian/patches/dont_install_data.patch
+++ b/debian/patches/dont_install_data.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 2ede535d2e2d7ea31f47e0cd55efd74fb3c59da2 Mon Sep 17 00:00:00 2001
++From dc1fb232af3bbb571ffc41719d1beb56f1e3d8e8 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 12:46:32 -0700
 +Subject: dont_install_data
 +
 +Patch-Name: dont_install_data.patch
 +---
 + setup.py | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index fc0a96f..cde50c4 100644
++index f8ad467..3d34966 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -75,7 +75,6 @@ if __name__ == "__main__":
++@@ -81,7 +81,6 @@ if __name__ == "__main__":
 +         download_url=release.download_url,
 +         classifiers=release.classifiers,
 +         packages=packages,
 +-        data_files=data,
 +         ext_modules=extension,
 +         cmdclass={
 +             'install': AddExtensionInstallCommand,

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