[Python-modules-commits] [python-networkx] 07/09: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Jan 31 11:30:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-networkx.
commit a596fa87329b7ab74fc5ca95ffe9be079088bc3f
Merge: 2c43dc9 dab8178
Author: Sandro Tosi <morph at debian.org>
Date: Sun Jan 31 11:14:13 2016 +0000
merge patched into master
LICENSE.txt | 3 +--
PKG-INFO | 2 +-
README.rst | 6 +-----
debian/.git-dpm | 6 +++---
debian/patches/10_doc_relocation | 2 +-
debian/patches/20_example_dirs_remove | 2 +-
debian/patches/30_use_local_objects.inv | 4 ++--
debian/patches/using-local-mathjax.js.patch | 4 ++--
doc/source/conf.py | 2 +-
doc/source/reference/news.rst | 4 ++--
doc/source/tutorial/tutorial.rst | 4 ++--
networkx.egg-info/PKG-INFO | 2 +-
networkx/drawing/tests/test_agraph.py | 5 +++--
networkx/release.py | 2 +-
networkx/version.py | 8 ++++----
15 files changed, 26 insertions(+), 30 deletions(-)
diff --cc debian/.git-dpm
index 29b1c3a,0000000..3ebda61
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
- 4766591fda1c3208115c58ff0e0875cdf779a7ee
- 4766591fda1c3208115c58ff0e0875cdf779a7ee
- 88a9a51215e3cb598723261c0815c2e02e7dfce4
++dab8178345ed3c93414f040ad1d51c9f3bc4790a
++dab8178345ed3c93414f040ad1d51c9f3bc4790a
++d17c01666c785cb70a3a0ad9af7b6ce0fbc6e143
+d17c01666c785cb70a3a0ad9af7b6ce0fbc6e143
+python-networkx_1.11.orig.tar.gz
+ac24380b13dfe92633370ad2091c0c04b6d098a2
+1315737
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/10_doc_relocation
index 57a03dd,0000000..b78cf22
mode 100644,000000..100644
--- a/debian/patches/10_doc_relocation
+++ b/debian/patches/10_doc_relocation
@@@ -1,26 -1,0 +1,26 @@@
- From ebc732a71f4880b69e9a3b4a4a73c4c6f658aa02 Mon Sep 17 00:00:00 2001
++From c3bfa0e212648be87a879443b3a974f63eeb9413 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Thu, 8 Oct 2015 12:34:57 -0700
+Subject: install doc in the right place for Debian
+
+Forwarded: no
+Last-Update: 2014-06-22
+
+Patch-Name: 10_doc_relocation
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 07d752b..56b393f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@ packages=["networkx",
+ "networkx.testing",
+ "networkx.utils"]
+
+-docdirbase = 'share/doc/networkx-%s' % version
++docdirbase = 'share/doc/python-networkx'
+ # add basic documentation
+ data = [(docdirbase, glob("*.txt"))]
+ # add examples
diff --cc debian/patches/20_example_dirs_remove
index 1cb6cd5,0000000..e78a1de
mode 100644,000000..100644
--- a/debian/patches/20_example_dirs_remove
+++ b/debian/patches/20_example_dirs_remove
@@@ -1,26 -1,0 +1,26 @@@
- From a36c79fc0079b4a5caeef27a3f1ba7894568d9ff Mon Sep 17 00:00:00 2001
++From d17f4620aad50c3dfcb50991e5586b94801d0196 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Thu, 8 Oct 2015 12:34:58 -0700
+Subject: Don't created dirs for examples no more present
+
+Forwarded: no
+Last-Update: 2014-06-22
+
+Patch-Name: 20_example_dirs_remove
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 56b393f..eb9f75f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -71,7 +71,7 @@ for d in ['advanced',
+ 'graph',
+ 'multigraph',
+ 'pygraphviz',
+- 'readwrite']:
++ 'subclass']:
+ dd = os.path.join(docdirbase,'examples', d)
+ pp = os.path.join('examples', d)
+ data.append((dd, glob(os.path.join(pp ,"*.py"))))
diff --cc debian/patches/30_use_local_objects.inv
index 8d602a2,0000000..0db312a
mode 100644,000000..100644
--- a/debian/patches/30_use_local_objects.inv
+++ b/debian/patches/30_use_local_objects.inv
@@@ -1,28 -1,0 +1,28 @@@
- From e84df281a3226a2394b3d29c3aaed8a09b5666a5 Mon Sep 17 00:00:00 2001
++From 10f122ea605e382b0a4da1e7aa0fac4048a49d20 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:34:59 -0700
+Subject: Use a local copy of object.inv from doc.python.org and
+ docs.scipy.org, instead of downloading them each time from the internet
+
+Last-Update: 2014-06-22
+
+Patch-Name: 30_use_local_objects.inv
+---
+ doc/source/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
- index 96ea8ef..50eb526 100644
++index 24faf00..35a1980 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -217,8 +217,8 @@ latex_documents = [('tutorial/index', 'networkx_tutorial.tex',
+ #latex_appendices = ['credits']
+
+ # Intersphinx mapping
+-intersphinx_mapping = {'http://docs.python.org/': None,
+- 'http://docs.scipy.org/doc/numpy/': None,
++intersphinx_mapping = {'http://docs.python.org/': '../../debian/python.org_objects.inv',
++ 'http://docs.scipy.org/doc/numpy/': '../../debian/scipy.org_numpy_objects.inv',
+ }
+
+ # For trac custom roles
diff --cc debian/patches/using-local-mathjax.js.patch
index e0b6729,0000000..bee520c
mode 100644,000000..100644
--- a/debian/patches/using-local-mathjax.js.patch
+++ b/debian/patches/using-local-mathjax.js.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 4766591fda1c3208115c58ff0e0875cdf779a7ee Mon Sep 17 00:00:00 2001
++From dab8178345ed3c93414f040ad1d51c9f3bc4790a Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Thu, 8 Oct 2015 12:35:00 -0700
+Subject: Using local MathJax.js script
+
+ This avoids a privacy breach.
+Forwarded: no
+Last-Update: 2014-06-23
+
+Patch-Name: using-local-mathjax.js.patch
+---
+ doc/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
- index 50eb526..06cc05a 100644
++index 35a1980..f934195 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -225,6 +225,6 @@ intersphinx_mapping = {'http://docs.python.org/': '../../debian/python.org_objec
+
+ default_role = 'math'
+ trac_url = 'https://networkx.lanl.gov/trac/'
+-mathjax_path = 'https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML'
++mathjax_path = 'MathJax.js'
+
+ numpydoc_show_class_members = False
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-networkx.git
More information about the Python-modules-commits
mailing list