[Python-modules-commits] [python-networkx] 07/10: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Thu Jan 28 20:07:41 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 907fa712a1cebeed47f82dc4bbb70864c5d26c06
Merge: d3215e2 4766591
Author: Sandro Tosi <morph at debian.org>
Date: Thu Jan 28 19:42:55 2016 +0000
merge patched into master
PKG-INFO | 4 +-
debian/.git-dpm | 6 +-
debian/patches/10_doc_relocation | 2 +-
debian/patches/20_example_dirs_remove | 2 +-
debian/patches/30_use_local_objects.inv | 2 +-
debian/patches/using-local-mathjax.js.patch | 2 +-
doc/source/install.rst | 2 +-
doc/source/reference/api_1.11.rst | 12 ++-
doc/source/reference/legal.rst | 2 +-
doc/source/reference/news.rst | 1 +
doc/source/tutorial/tutorial.rst | 104 ++++++++++++-------------
examples/advanced/heavy_metal_umlaut.py | 10 +--
examples/algorithms/blockmodel.py | 17 ++--
examples/algorithms/krackhardt_centrality.py | 10 +--
examples/algorithms/rcm.py | 8 +-
examples/basic/properties.py | 4 +-
examples/basic/read_write.py | 9 ++-
examples/drawing/atlas.py | 65 ++++++++--------
examples/drawing/chess_masters.py | 35 ++++-----
examples/drawing/circular_tree.py | 19 +++--
examples/drawing/degree_histogram.py | 7 +-
examples/drawing/edge_colormap.py | 8 +-
examples/drawing/ego_graph.py | 2 +-
examples/drawing/four_grids.py | 13 ++--
examples/drawing/giant_component.py | 38 +++++----
examples/drawing/house_with_colors.py | 2 +-
examples/drawing/knuth_miles.py | 13 ++--
examples/drawing/labels_and_colors.py | 10 +--
examples/drawing/lanl_routes.py | 60 +++++++-------
examples/drawing/node_colormap.py | 4 +-
examples/drawing/sampson.py | 8 +-
examples/drawing/unix_email.py | 15 ++--
examples/drawing/weighted_graph.py | 4 +-
examples/graph/atlas.py | 65 ++++++++--------
examples/graph/atlas2.py | 25 +++---
examples/graph/degree_sequence.py | 10 +--
examples/graph/erdos_renyi.py | 6 +-
examples/graph/expected_degree_sequence.py | 5 +-
examples/graph/football.py | 5 +-
examples/graph/knuth_miles.py | 13 ++--
examples/graph/napoleon_russian_campaign.py | 11 +--
examples/graph/roget.py | 13 ++--
examples/graph/unix_email.py | 15 ++--
examples/graph/words.py | 13 ++--
examples/javascript/force.py | 8 +-
examples/multigraph/chess_masters.py | 35 ++++-----
examples/pygraphviz/pygraphviz_attributes.py | 17 ++--
examples/pygraphviz/pygraphviz_draw.py | 11 +--
examples/pygraphviz/pygraphviz_simple.py | 19 ++---
examples/pygraphviz/write_dotfile.py | 40 ++++++----
examples/subclass/antigraph.py | 22 +++---
examples/subclass/printgraph.py | 25 +++---
networkx.egg-info/PKG-INFO | 4 +-
networkx.egg-info/requires.txt | 2 +-
networkx/classes/graph.py | 9 ++-
networkx/convert.py | 4 +-
networkx/convert_matrix.py | 2 +-
networkx/drawing/__init__.py | 4 +-
networkx/drawing/layout.py | 12 +--
networkx/drawing/nx_agraph.py | 36 +++++----
networkx/drawing/nx_pydot.py | 112 ++++++++++++---------------
networkx/drawing/nx_pylab.py | 6 +-
networkx/drawing/tests/test_agraph.py | 14 ++--
networkx/drawing/tests/test_pydot.py | 31 ++++----
networkx/release.py | 4 +-
networkx/version.py | 8 +-
66 files changed, 569 insertions(+), 537 deletions(-)
diff --cc debian/.git-dpm
index 40f1288,0000000..3c43def
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
- e3d0febef60a15a189eb7bc41532df0ee9ffee49
- e3d0febef60a15a189eb7bc41532df0ee9ffee49
- 6a408794c7f2665de3e5683bde893bed5397c590
++4766591fda1c3208115c58ff0e0875cdf779a7ee
++4766591fda1c3208115c58ff0e0875cdf779a7ee
++88a9a51215e3cb598723261c0815c2e02e7dfce4
+88a9a51215e3cb598723261c0815c2e02e7dfce4
+python-networkx_1.11~rc2.orig.tar.gz
+02bcd2bc2024835795f40cd472370edf3986fccb
+1315567
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/10_doc_relocation
index 27e68de,0000000..57a03dd
mode 100644,000000..100644
--- a/debian/patches/10_doc_relocation
+++ b/debian/patches/10_doc_relocation
@@@ -1,26 -1,0 +1,26 @@@
- From b75ac9566470e3876b3b3f5df5b83ead4a603c09 Mon Sep 17 00:00:00 2001
++From ebc732a71f4880b69e9a3b4a4a73c4c6f658aa02 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 47ae7a6,0000000..1cb6cd5
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 0de3bdc4e2480a6b7373e0c1c27a5ebf2652b119 Mon Sep 17 00:00:00 2001
++From a36c79fc0079b4a5caeef27a3f1ba7894568d9ff 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 b08ae57,0000000..8d602a2
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 a14dedcb8d1f98102634cb1beead74ea5fbed131 Mon Sep 17 00:00:00 2001
++From e84df281a3226a2394b3d29c3aaed8a09b5666a5 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
+--- 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 891a1a0,0000000..e0b6729
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 e3d0febef60a15a189eb7bc41532df0ee9ffee49 Mon Sep 17 00:00:00 2001
++From 4766591fda1c3208115c58ff0e0875cdf779a7ee 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
+--- 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