[Python-modules-commits] [python-networkx] 07/13: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Jan 3 00:29:29 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 1f860f4473ad0aef546a673f9b8b3c048da20fc2
Merge: c4419e8 e3d0feb
Author: Sandro Tosi <morph at debian.org>
Date: Sat Jan 2 21:36:29 2016 +0000
merge patched into master
PKG-INFO | 2 +-
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/gh-pages.py | 4 +-
doc/requirements.txt | 2 +-
doc/source/bibliography.rst | 12 +-
doc/source/conf.py | 2 +-
doc/source/install.rst | 3 +-
doc/source/reference/api_1.11.rst | 30 +++
doc/source/reference/api_1.5.rst | 2 +-
doc/source/reference/api_1.6.rst | 2 +-
doc/source/reference/api_changes.rst | 1 +
doc/source/reference/classes.digraph.rst | 3 +
doc/source/reference/classes.graph.rst | 4 +
doc/source/reference/classes.multidigraph.rst | 4 +
doc/source/reference/classes.multigraph.rst | 4 +
doc/source/reference/drawing.rst | 1 +
doc/source/reference/news.rst | 100 +++++--
doc/source/templates/gallery.html | 53 ----
examples/drawing/atlas.py | 87 ++++++-
examples/drawing/chess_masters.py | 166 +++++++++++-
examples/drawing/chess_masters_WCC.pgn.bz2 | Bin 39 -> 100224 bytes
examples/drawing/knuth_miles.txt.gz | Bin 27 -> 20317 bytes
examples/drawing/unix_email.mbox | 85 +++++-
networkx.egg-info/PKG-INFO | 2 +-
networkx.egg-info/SOURCES.txt | 2 +-
networkx/algorithms/assortativity/connectivity.py | 7 +-
networkx/algorithms/bipartite/projection.py | 10 +-
networkx/algorithms/centrality/betweenness.py | 4 +-
.../algorithms/centrality/betweenness_subset.py | 4 +-
networkx/algorithms/centrality/eigenvector.py | 4 +-
networkx/algorithms/centrality/harmonic.py | 7 +-
networkx/algorithms/centrality/katz.py | 2 +-
networkx/algorithms/flow/__init__.py | 10 -
networkx/algorithms/flow/capacityscaling.py | 17 +-
networkx/algorithms/flow/mincost.py | 28 +-
networkx/algorithms/flow/networksimplex.py | 13 +-
networkx/algorithms/link_analysis/hits_alg.py | 4 +-
networkx/algorithms/matching.py | 2 +-
networkx/algorithms/mis.py | 2 +-
networkx/algorithms/richclub.py | 2 +-
networkx/algorithms/shortest_paths/weighted.py | 6 +-
networkx/classes/digraph.py | 5 +-
networkx/classes/function.py | 4 +-
networkx/classes/graph.py | 11 +-
networkx/classes/multidigraph.py | 5 +-
networkx/classes/multigraph.py | 15 +-
networkx/drawing/layout.py | 289 +++++++++------------
networkx/drawing/nx_pylab.py | 14 +-
networkx/drawing/tests/test_layout.py | 115 +++++++-
networkx/generators/stochastic.py | 4 +-
networkx/linalg/algebraicconnectivity.py | 2 +-
networkx/readwrite/gml.py | 2 +-
networkx/readwrite/nx_shp.py | 1 +
networkx/release.py | 3 +-
networkx/version.py | 8 +-
59 files changed, 822 insertions(+), 367 deletions(-)
diff --cc debian/.git-dpm
index d957425,0000000..e982f25
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
- a7f1e757bce251f908d5032f624db82ea8813ae6
- a7f1e757bce251f908d5032f624db82ea8813ae6
- d79cae688e724edad693d1bb7bff077494033a74
++e3d0febef60a15a189eb7bc41532df0ee9ffee49
++e3d0febef60a15a189eb7bc41532df0ee9ffee49
++6a408794c7f2665de3e5683bde893bed5397c590
+6a408794c7f2665de3e5683bde893bed5397c590
+python-networkx_1.11~rc1.orig.tar.gz
+2836b3bc509140147fc06c118a3b9853fb84a525
+1315650
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/10_doc_relocation
index f173680,0000000..27e68de
mode 100644,000000..100644
--- a/debian/patches/10_doc_relocation
+++ b/debian/patches/10_doc_relocation
@@@ -1,26 -1,0 +1,26 @@@
- From 1b7e72c2e7e568dc65da2070cb5bd0926f25100d Mon Sep 17 00:00:00 2001
++From b75ac9566470e3876b3b3f5df5b83ead4a603c09 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 d6a8d6f,0000000..47ae7a6
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 e53433f9ba06313ea33a8325b381f66806f9ff0b Mon Sep 17 00:00:00 2001
++From 0de3bdc4e2480a6b7373e0c1c27a5ebf2652b119 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 d46e03e,0000000..b08ae57
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 c67dd301ad7b32b73f69b0cc1e6742cad8d3f392 Mon Sep 17 00:00:00 2001
++From a14dedcb8d1f98102634cb1beead74ea5fbed131 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 e265348..d0d4f69 100644
++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 86e8ed2,0000000..891a1a0
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 a7f1e757bce251f908d5032f624db82ea8813ae6 Mon Sep 17 00:00:00 2001
++From e3d0febef60a15a189eb7bc41532df0ee9ffee49 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 d0d4f69..d6a6ae8 100644
++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