Update py-networkx to 1.6.

Based on PR 46506 by Wen Heping.
* let to register egg-info.
* marked as incompatible with python 2.5, as new features in 1.3.
  but not marked as compatible with 3.x, one file will not be compiled well
  both 3.1 and 3.2.

Lease Log:

Networkx-1.6

Release date: 20 November 2011

Highlights

New functions for finding articulation points, generating random bipartite
graphs, constructing adjacency matrix representations, forming graph products,
computing assortativity coefficients, measuring subgraph centrality and
communicability, finding k-clique communities, and writing JSON format output.

New examples for drawing with D3 Javascript library, and ordering matrices with
the Cuthill-McKee algorithm.

More memory efficient implementation of current-flow betweenness and new
approximation algorithms for current-flow betweenness and shortest-path
betweenness.

Simplified handling of "weight" attributes for algorithms that use
weights/costs/values. See Version 1.6 notes and API changes.

Updated all code to work with the PyPy Python implementation http://pypy.org
which produces faster performance on many algorithms.

For full details of the tickets closed for this release (added features and bug
fixes) see: https://networkx.lanl.gov/trac/query?status=closed&group=milestone&milestone=networkx-1.6

API Changes

See Version 1.6 notes and API changes:
	http://networkx.lanl.gov/reference/api_1.6.html

Networkx-1.5

Release date: 4 June 2011

For full details of the tickets closed for this release see: https://networkx.lanl.gov/trac/query?status=closed&group=milestone&milestone=networkx-1.5

Highlights

New features

	* Algorithms for generating and analyzing bipartite graphs
	* Maximal independent set algorithm
	* Erd?s-Gallai graphical degree sequence test
	* Negative edge cycle test
	* More memory efficient Dijkstra path length with cutoff parameter
	* Weighted clustering coefficient
	* Read and write version 1.2 of GEXF reader format
	* Neighbor degree correlation that handle subsets of nodes
	* In-place node relabeling
	* Many `weighted' graph algorithms now take optional parameter to use
	  specified edge attribute (default=`weight') (ticket 509)
	* Test for distance regular graphs
	* Fast directed Erd?s-Renyi graph generator
	* Fast expected degree graph generator
	* Navigable small world generator
	* Waxman model generator
	* Geographical threshold graph generator
	* Karate Club, Florentine Families, and Davis' Women's Club graphs

API Changes
See Version 1.5 notes and API changes
	http://networkx.lanl.gov/reference/api_1.5.html

Bug fixes
	* Fix edge handling for multigraphs in networkx/graphviz interface
	  (ticket 507)
	* Update networkx/pydot interface for new versions of pydot
	  (ticket 506), (ticket 535)
	* Fix negative cycle handling in Bellman-Ford (ticket 502)
	* Write more attributes with GraphML and GML formats (ticket 480)
	* Handle white space better in read_edgelist (ticket 513)
	* Better parsing of Pajek format files (ticket 524) (ticket 542)
	* Isolates functions work with directed graphs (ticket 526)
	* Faster conversion to numpy matrices (ticket 529)
	* Add graph[`name'] and use properties to access Graph.name (ticket 544)
	* Topological sort confused None and 0 (ticket 546)
	* GEXF writer mishandled weight=0 (ticket 550)
	* Speedup in SciPy version of PageRank (ticket 554)
	* Numpy PageRank node order incorrect + speedups (ticket 555)

Networkx-1.4

Release date: 23 January 2011

New features
	* k-shell,k-crust,k-corona
	* read GraphML files from yEd
	* read/write GEXF format files
	* find cycles in a directed graph
	* DFS and BFS algorithms
	* chordal graph functions
	* Prim's algorithm for minimum spanning tree
	* r-ary tree generator
	* rich club coefficient
	* NumPy matrix version of Floyd's algorithm for all-pairs shortest path
	* read GIS shapefiles
	* functions to get and set node and edge attributes
	* and more, see https://networkx.lanl.gov/trac/query?status=closed&group=milestone&milestone=networkx-1.4

API Changes
	* gnp_random_graph() now takes a directed=True|False keyword instead of
	  create_using
	* gnm_random_graph() now takes a directed=True|False keyword instead of
	  create_using

Bug fixes
	* see https://networkx.lanl.gov/trac/query?status=closed&group=milestone&milestone=networkx-1.4

Networkx-1.3

Release date: 28 August 2010

See: https://networkx.lanl.gov/trac/timeline

New features
	* Works with Python versions 2.6, 2.7, 3.1, and 3.2 (but not 2.4 and 2.5).
	* Minimum cost flow algorithms
	* Bellman-Ford shortest paths
	* GraphML reader and writer
	* More exception/error types
	* Updated many tests to unittest style. Run with:
	  "import networkx; networkx.test()" (requires nose testing package)
	* and more, see https://networkx.lanl.gov/trac/query?status=closed&group=milestone&milestone=networkx-1.3

API Changes
	* minimum_spanning_tree() now returns a NetworkX Graph (a tree or forest)

Bug fixes
	* see https://networkx.lanl.gov/trac/query?status=closed&group=milestone&milestone=networkx-1.3

3 files changed, 391 insertions, 37 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 39ef50f32ce..069c6b2ff80 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/08/27 03:09:18 gls Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/02 13:19:17 obache Exp $
 #
 
-DISTNAME=	networkx-1.2
+DISTNAME=	networkx-1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	http://pypi.python.org/packages/source/n/networkx/ \
@@ -13,7 +13,8 @@ COMMENT=	Python package for creating and manipulating graphs and networks
 LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PYDISTUTILSPKG=	yes
 
-.include "../../lang/python/extension.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=	25
+
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index 055c692d89d..8a9eca9647c 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,13 +1,83 @@
-@comment $NetBSD: PLIST,v 1.6 2010/08/27 03:09:18 gls Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/06/02 13:19:17 obache Exp $
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/networkx/__init__.py
 ${PYSITELIB}/networkx/__init__.pyc
 ${PYSITELIB}/networkx/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/__init__.py
 ${PYSITELIB}/networkx/algorithms/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/__init__.pyo
-${PYSITELIB}/networkx/algorithms/bipartite.py
-${PYSITELIB}/networkx/algorithms/bipartite.pyc
-${PYSITELIB}/networkx/algorithms/bipartite.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/__init__.py
+${PYSITELIB}/networkx/algorithms/assortativity/__init__.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/__init__.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/connectivity.py
+${PYSITELIB}/networkx/algorithms/assortativity/connectivity.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/connectivity.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/correlation.py
+${PYSITELIB}/networkx/algorithms/assortativity/correlation.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/correlation.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/mixing.py
+${PYSITELIB}/networkx/algorithms/assortativity/mixing.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/mixing.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/neighbor_degree.py
+${PYSITELIB}/networkx/algorithms/assortativity/neighbor_degree.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/neighbor_degree.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/pairs.py
+${PYSITELIB}/networkx/algorithms/assortativity/pairs.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/pairs.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/tests/base_test.py
+${PYSITELIB}/networkx/algorithms/assortativity/tests/base_test.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/tests/base_test.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_connectivity.py
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_connectivity.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_connectivity.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_correlation.py
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_correlation.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_correlation.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_mixing.py
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_mixing.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_mixing.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_neighbor_degree.py
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_neighbor_degree.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_neighbor_degree.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_pairs.py
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_pairs.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/tests/test_pairs.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/__init__.py
+${PYSITELIB}/networkx/algorithms/bipartite/__init__.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/__init__.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/basic.py
+${PYSITELIB}/networkx/algorithms/bipartite/basic.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/basic.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/centrality.py
+${PYSITELIB}/networkx/algorithms/bipartite/centrality.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/centrality.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/cluster.py
+${PYSITELIB}/networkx/algorithms/bipartite/cluster.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/cluster.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/projection.py
+${PYSITELIB}/networkx/algorithms/bipartite/projection.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/projection.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/redundancy.py
+${PYSITELIB}/networkx/algorithms/bipartite/redundancy.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/redundancy.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/spectral.py
+${PYSITELIB}/networkx/algorithms/bipartite/spectral.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/spectral.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_basic.py
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_basic.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_basic.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_centrality.py
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_centrality.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_centrality.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_cluster.py
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_cluster.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_cluster.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_project.py
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_project.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_project.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_spectral_bipartivity.py
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_spectral_bipartivity.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_spectral_bipartivity.pyo
 ${PYSITELIB}/networkx/algorithms/block.py
 ${PYSITELIB}/networkx/algorithms/block.pyc
 ${PYSITELIB}/networkx/algorithms/block.pyo
@@ -26,6 +96,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/betweenness_subset.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/closeness.py
 ${PYSITELIB}/networkx/algorithms/centrality/closeness.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/closeness.pyo
+${PYSITELIB}/networkx/algorithms/centrality/communicability_alg.py
+${PYSITELIB}/networkx/algorithms/centrality/communicability_alg.pyc
+${PYSITELIB}/networkx/algorithms/centrality/communicability_alg.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/current_flow_betweenness.py
 ${PYSITELIB}/networkx/algorithms/centrality/current_flow_betweenness.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/current_flow_betweenness.pyo
@@ -41,6 +114,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/degree_alg.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.py
 ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.pyo
+${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.py
+${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.pyc
+${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/load.py
 ${PYSITELIB}/networkx/algorithms/centrality/load.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/load.pyo
@@ -50,6 +126,12 @@ ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.pyo
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_closeness_centrality.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_closeness_centrality.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_closeness_centrality.pyo
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_communicability.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_communicability.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_communicability.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality.pyo
@@ -68,18 +150,39 @@ ${PYSITELIB}/networkx/algorithms/centrality/tests/test_eigenvector_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.pyo
+${PYSITELIB}/networkx/algorithms/chordal/__init__.py
+${PYSITELIB}/networkx/algorithms/chordal/__init__.pyc
+${PYSITELIB}/networkx/algorithms/chordal/__init__.pyo
+${PYSITELIB}/networkx/algorithms/chordal/chordal_alg.py
+${PYSITELIB}/networkx/algorithms/chordal/chordal_alg.pyc
+${PYSITELIB}/networkx/algorithms/chordal/chordal_alg.pyo
+${PYSITELIB}/networkx/algorithms/chordal/tests/test_chordal.py
+${PYSITELIB}/networkx/algorithms/chordal/tests/test_chordal.pyc
+${PYSITELIB}/networkx/algorithms/chordal/tests/test_chordal.pyo
 ${PYSITELIB}/networkx/algorithms/clique.py
 ${PYSITELIB}/networkx/algorithms/clique.pyc
 ${PYSITELIB}/networkx/algorithms/clique.pyo
 ${PYSITELIB}/networkx/algorithms/cluster.py
 ${PYSITELIB}/networkx/algorithms/cluster.pyc
 ${PYSITELIB}/networkx/algorithms/cluster.pyo
+${PYSITELIB}/networkx/algorithms/community/__init__.py
+${PYSITELIB}/networkx/algorithms/community/__init__.pyc
+${PYSITELIB}/networkx/algorithms/community/__init__.pyo
+${PYSITELIB}/networkx/algorithms/community/kclique.py
+${PYSITELIB}/networkx/algorithms/community/kclique.pyc
+${PYSITELIB}/networkx/algorithms/community/kclique.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_kclique.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_kclique.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_kclique.pyo
 ${PYSITELIB}/networkx/algorithms/components/__init__.py
 ${PYSITELIB}/networkx/algorithms/components/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/components/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/components/attracting.py
 ${PYSITELIB}/networkx/algorithms/components/attracting.pyc
 ${PYSITELIB}/networkx/algorithms/components/attracting.pyo
+${PYSITELIB}/networkx/algorithms/components/biconnected.py
+${PYSITELIB}/networkx/algorithms/components/biconnected.pyc
+${PYSITELIB}/networkx/algorithms/components/biconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/connected.py
 ${PYSITELIB}/networkx/algorithms/components/connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/connected.pyo
@@ -89,6 +192,9 @@ ${PYSITELIB}/networkx/algorithms/components/strongly_connected.pyo
 ${PYSITELIB}/networkx/algorithms/components/tests/test_attracting.py
 ${PYSITELIB}/networkx/algorithms/components/tests/test_attracting.pyc
 ${PYSITELIB}/networkx/algorithms/components/tests/test_attracting.pyo
+${PYSITELIB}/networkx/algorithms/components/tests/test_biconnected.py
+${PYSITELIB}/networkx/algorithms/components/tests/test_biconnected.pyc
+${PYSITELIB}/networkx/algorithms/components/tests/test_biconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/tests/test_connected.py
 ${PYSITELIB}/networkx/algorithms/components/tests/test_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/tests/test_connected.pyo
@@ -113,6 +219,9 @@ ${PYSITELIB}/networkx/algorithms/dag.pyo
 ${PYSITELIB}/networkx/algorithms/distance_measures.py
 ${PYSITELIB}/networkx/algorithms/distance_measures.pyc
 ${PYSITELIB}/networkx/algorithms/distance_measures.pyo
+${PYSITELIB}/networkx/algorithms/distance_regular.py
+${PYSITELIB}/networkx/algorithms/distance_regular.pyc
+${PYSITELIB}/networkx/algorithms/distance_regular.pyo
 ${PYSITELIB}/networkx/algorithms/euler.py
 ${PYSITELIB}/networkx/algorithms/euler.pyc
 ${PYSITELIB}/networkx/algorithms/euler.pyo
@@ -122,15 +231,24 @@ ${PYSITELIB}/networkx/algorithms/flow/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.py
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.pyc
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.pyo
+${PYSITELIB}/networkx/algorithms/flow/mincost.py
+${PYSITELIB}/networkx/algorithms/flow/mincost.pyc
+${PYSITELIB}/networkx/algorithms/flow/mincost.pyo
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow.py
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow.pyc
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow.pyo
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow_large_graph.py
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow_large_graph.pyc
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow_large_graph.pyo
-${PYSITELIB}/networkx/algorithms/isolates.py
-${PYSITELIB}/networkx/algorithms/isolates.pyc
-${PYSITELIB}/networkx/algorithms/isolates.pyo
+${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.py
+${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.pyc
+${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.pyo
+${PYSITELIB}/networkx/algorithms/graphical.py
+${PYSITELIB}/networkx/algorithms/graphical.pyc
+${PYSITELIB}/networkx/algorithms/graphical.pyo
+${PYSITELIB}/networkx/algorithms/isolate.py
+${PYSITELIB}/networkx/algorithms/isolate.pyc
+${PYSITELIB}/networkx/algorithms/isolate.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/__init__.py
 ${PYSITELIB}/networkx/algorithms/isomorphism/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/isomorphism/__init__.pyo
@@ -140,19 +258,25 @@ ${PYSITELIB}/networkx/algorithms/isomorphism/isomorph.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/isomorphvf2.py
 ${PYSITELIB}/networkx/algorithms/isomorphism/isomorphvf2.pyc
 ${PYSITELIB}/networkx/algorithms/isomorphism/isomorphvf2.pyo
+${PYSITELIB}/networkx/algorithms/isomorphism/matchhelpers.py
+${PYSITELIB}/networkx/algorithms/isomorphism/matchhelpers.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/matchhelpers.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/iso_r01_s80.A99
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/iso_r01_s80.B99
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/si2_b06_m200.A99
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/si2_b06_m200.B99
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphism.py
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphism.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphism.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphvf2.py
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphvf2.pyc
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphvf2.pyo
-${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2weighted.py
-${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2weighted.pyc
-${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2weighted.pyo
-${PYSITELIB}/networkx/algorithms/isomorphism/vf2weighted.py
-${PYSITELIB}/networkx/algorithms/isomorphism/vf2weighted.pyc
-${PYSITELIB}/networkx/algorithms/isomorphism/vf2weighted.pyo
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2userfunc.py
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2userfunc.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2userfunc.pyo
+${PYSITELIB}/networkx/algorithms/isomorphism/vf2userfunc.py
+${PYSITELIB}/networkx/algorithms/isomorphism/vf2userfunc.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/vf2userfunc.pyo
 ${PYSITELIB}/networkx/algorithms/link_analysis/__init__.py
 ${PYSITELIB}/networkx/algorithms/link_analysis/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/link_analysis/__init__.pyo
@@ -171,27 +295,39 @@ ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_pagerank.pyo
 ${PYSITELIB}/networkx/algorithms/matching.py
 ${PYSITELIB}/networkx/algorithms/matching.pyc
 ${PYSITELIB}/networkx/algorithms/matching.pyo
-${PYSITELIB}/networkx/algorithms/mixing.py
-${PYSITELIB}/networkx/algorithms/mixing.pyc
-${PYSITELIB}/networkx/algorithms/mixing.pyo
+${PYSITELIB}/networkx/algorithms/mis.py
+${PYSITELIB}/networkx/algorithms/mis.pyc
+${PYSITELIB}/networkx/algorithms/mis.pyo
 ${PYSITELIB}/networkx/algorithms/mst.py
 ${PYSITELIB}/networkx/algorithms/mst.pyc
 ${PYSITELIB}/networkx/algorithms/mst.pyo
 ${PYSITELIB}/networkx/algorithms/operators.py
 ${PYSITELIB}/networkx/algorithms/operators.pyc
 ${PYSITELIB}/networkx/algorithms/operators.pyo
+${PYSITELIB}/networkx/algorithms/product.py
+${PYSITELIB}/networkx/algorithms/product.pyc
+${PYSITELIB}/networkx/algorithms/product.pyo
+${PYSITELIB}/networkx/algorithms/richclub.py
+${PYSITELIB}/networkx/algorithms/richclub.pyc
+${PYSITELIB}/networkx/algorithms/richclub.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/__init__.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/astar.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/astar.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/astar.pyo
+${PYSITELIB}/networkx/algorithms/shortest_paths/dense.py
+${PYSITELIB}/networkx/algorithms/shortest_paths/dense.pyc
+${PYSITELIB}/networkx/algorithms/shortest_paths/dense.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/generic.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/generic.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/generic.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_astar.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_astar.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_astar.pyo
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense.py
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense.pyc
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_generic.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_generic.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_generic.pyo
@@ -210,48 +346,84 @@ ${PYSITELIB}/networkx/algorithms/shortest_paths/weighted.pyo
 ${PYSITELIB}/networkx/algorithms/smetric.py
 ${PYSITELIB}/networkx/algorithms/smetric.pyc
 ${PYSITELIB}/networkx/algorithms/smetric.pyo
-${PYSITELIB}/networkx/algorithms/tests/test_bipartite.py
-${PYSITELIB}/networkx/algorithms/tests/test_bipartite.pyc
-${PYSITELIB}/networkx/algorithms/tests/test_bipartite.pyo
+${PYSITELIB}/networkx/algorithms/swap.py
+${PYSITELIB}/networkx/algorithms/swap.pyc
+${PYSITELIB}/networkx/algorithms/swap.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_block.py
 ${PYSITELIB}/networkx/algorithms/tests/test_block.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_block.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_boundary.py
+${PYSITELIB}/networkx/algorithms/tests/test_boundary.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_boundary.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_clique.py
+${PYSITELIB}/networkx/algorithms/tests/test_clique.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_clique.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_cluster.py
 ${PYSITELIB}/networkx/algorithms/tests/test_cluster.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_cluster.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_core.py
+${PYSITELIB}/networkx/algorithms/tests/test_core.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_core.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_cycles.py
 ${PYSITELIB}/networkx/algorithms/tests/test_cycles.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_cycles.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_dag.py
+${PYSITELIB}/networkx/algorithms/tests/test_dag.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_dag.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_distance_measures.py
 ${PYSITELIB}/networkx/algorithms/tests/test_distance_measures.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_distance_measures.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_distance_regular.py
+${PYSITELIB}/networkx/algorithms/tests/test_distance_regular.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_distance_regular.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.py
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.pyo
-${PYSITELIB}/networkx/algorithms/tests/test_mixing_attributes.py
-${PYSITELIB}/networkx/algorithms/tests/test_mixing_attributes.pyc
-${PYSITELIB}/networkx/algorithms/tests/test_mixing_attributes.pyo
-${PYSITELIB}/networkx/algorithms/tests/test_mixing_degree.py
-${PYSITELIB}/networkx/algorithms/tests/test_mixing_degree.pyc
-${PYSITELIB}/networkx/algorithms/tests/test_mixing_degree.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_graphical.py
+${PYSITELIB}/networkx/algorithms/tests/test_graphical.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_graphical.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_matching.py
+${PYSITELIB}/networkx/algorithms/tests/test_matching.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_matching.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_mis.py
+${PYSITELIB}/networkx/algorithms/tests/test_mis.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_mis.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_mst.py
 ${PYSITELIB}/networkx/algorithms/tests/test_mst.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_mst.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_operators.py
 ${PYSITELIB}/networkx/algorithms/tests/test_operators.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_operators.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_product.py
+${PYSITELIB}/networkx/algorithms/tests/test_product.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_product.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_richclub.py
+${PYSITELIB}/networkx/algorithms/tests/test_richclub.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_richclub.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_smetric.py
 ${PYSITELIB}/networkx/algorithms/tests/test_smetric.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_smetric.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_swap.py
+${PYSITELIB}/networkx/algorithms/tests/test_swap.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_swap.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_vitality.py
 ${PYSITELIB}/networkx/algorithms/tests/test_vitality.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_vitality.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/__init__.py
 ${PYSITELIB}/networkx/algorithms/traversal/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/__init__.pyo
+${PYSITELIB}/networkx/algorithms/traversal/breadth_first_search.py
+${PYSITELIB}/networkx/algorithms/traversal/breadth_first_search.pyc
+${PYSITELIB}/networkx/algorithms/traversal/breadth_first_search.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/depth_first_search.py
 ${PYSITELIB}/networkx/algorithms/traversal/depth_first_search.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/depth_first_search.pyo
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_bfs.py
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_bfs.pyc
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_bfs.pyo
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_dfs.py
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_dfs.pyc
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_dfs.pyo
 ${PYSITELIB}/networkx/algorithms/vitality.py
 ${PYSITELIB}/networkx/algorithms/vitality.pyc
 ${PYSITELIB}/networkx/algorithms/vitality.pyo
@@ -273,15 +445,24 @@ ${PYSITELIB}/networkx/classes/multidigraph.pyo
 ${PYSITELIB}/networkx/classes/multigraph.py
 ${PYSITELIB}/networkx/classes/multigraph.pyc
 ${PYSITELIB}/networkx/classes/multigraph.pyo
+${PYSITELIB}/networkx/classes/tests/historical_tests.py
+${PYSITELIB}/networkx/classes/tests/historical_tests.pyc
+${PYSITELIB}/networkx/classes/tests/historical_tests.pyo
 ${PYSITELIB}/networkx/classes/tests/test_digraph.py
 ${PYSITELIB}/networkx/classes/tests/test_digraph.pyc
 ${PYSITELIB}/networkx/classes/tests/test_digraph.pyo
+${PYSITELIB}/networkx/classes/tests/test_digraph_historical.py
+${PYSITELIB}/networkx/classes/tests/test_digraph_historical.pyc
+${PYSITELIB}/networkx/classes/tests/test_digraph_historical.pyo
 ${PYSITELIB}/networkx/classes/tests/test_function.py
 ${PYSITELIB}/networkx/classes/tests/test_function.pyc
 ${PYSITELIB}/networkx/classes/tests/test_function.pyo
 ${PYSITELIB}/networkx/classes/tests/test_graph.py
 ${PYSITELIB}/networkx/classes/tests/test_graph.pyc
 ${PYSITELIB}/networkx/classes/tests/test_graph.pyo
+${PYSITELIB}/networkx/classes/tests/test_graph_historical.py
+${PYSITELIB}/networkx/classes/tests/test_graph_historical.pyc
+${PYSITELIB}/networkx/classes/tests/test_graph_historical.pyo
 ${PYSITELIB}/networkx/classes/tests/test_multidigraph.py
 ${PYSITELIB}/networkx/classes/tests/test_multidigraph.pyc
 ${PYSITELIB}/networkx/classes/tests/test_multidigraph.pyo
@@ -321,6 +502,18 @@ ${PYSITELIB}/networkx/drawing/tests/test_pylab.pyo
 ${PYSITELIB}/networkx/exception.py
 ${PYSITELIB}/networkx/exception.pyc
 ${PYSITELIB}/networkx/exception.pyo
+${PYSITELIB}/networkx/external/__init__.py
+${PYSITELIB}/networkx/external/__init__.pyc
+${PYSITELIB}/networkx/external/__init__.pyo
+${PYSITELIB}/networkx/external/decorator/__init__.py
+${PYSITELIB}/networkx/external/decorator/__init__.pyc
+${PYSITELIB}/networkx/external/decorator/__init__.pyo
+${PYSITELIB}/networkx/external/decorator/_decorator.py
+${PYSITELIB}/networkx/external/decorator/_decorator.pyc
+${PYSITELIB}/networkx/external/decorator/_decorator.pyo
+${PYSITELIB}/networkx/external/decorator/_decorator3.py
+${PYSITELIB}/networkx/external/decorator/_decorator3.pyc
+${PYSITELIB}/networkx/external/decorator/_decorator3.pyo
 ${PYSITELIB}/networkx/generators/__init__.py
 ${PYSITELIB}/networkx/generators/__init__.pyc
 ${PYSITELIB}/networkx/generators/__init__.pyo
@@ -348,21 +541,72 @@ ${PYSITELIB}/networkx/generators/geometric.pyo
 ${PYSITELIB}/networkx/generators/hybrid.py
 ${PYSITELIB}/networkx/generators/hybrid.pyc
 ${PYSITELIB}/networkx/generators/hybrid.pyo
+${PYSITELIB}/networkx/generators/intersection.py
+${PYSITELIB}/networkx/generators/intersection.pyc
+${PYSITELIB}/networkx/generators/intersection.pyo
 ${PYSITELIB}/networkx/generators/line.py
 ${PYSITELIB}/networkx/generators/line.pyc
 ${PYSITELIB}/networkx/generators/line.pyo
+${PYSITELIB}/networkx/generators/random_clustered.py
+${PYSITELIB}/networkx/generators/random_clustered.pyc
+${PYSITELIB}/networkx/generators/random_clustered.pyo
 ${PYSITELIB}/networkx/generators/random_graphs.py
 ${PYSITELIB}/networkx/generators/random_graphs.pyc
 ${PYSITELIB}/networkx/generators/random_graphs.pyo
 ${PYSITELIB}/networkx/generators/small.py
 ${PYSITELIB}/networkx/generators/small.pyc
 ${PYSITELIB}/networkx/generators/small.pyo
+${PYSITELIB}/networkx/generators/social.py
+${PYSITELIB}/networkx/generators/social.pyc
+${PYSITELIB}/networkx/generators/social.pyo
 ${PYSITELIB}/networkx/generators/stochastic.py
 ${PYSITELIB}/networkx/generators/stochastic.pyc
 ${PYSITELIB}/networkx/generators/stochastic.pyo
+${PYSITELIB}/networkx/generators/tests/test_atlas.py
+${PYSITELIB}/networkx/generators/tests/test_atlas.pyc
+${PYSITELIB}/networkx/generators/tests/test_atlas.pyo
+${PYSITELIB}/networkx/generators/tests/test_bipartite.py
+${PYSITELIB}/networkx/generators/tests/test_bipartite.pyc
+${PYSITELIB}/networkx/generators/tests/test_bipartite.pyo
+${PYSITELIB}/networkx/generators/tests/test_classic.py
+${PYSITELIB}/networkx/generators/tests/test_classic.pyc
+${PYSITELIB}/networkx/generators/tests/test_classic.pyo
 ${PYSITELIB}/networkx/generators/tests/test_degree_seq.py
 ${PYSITELIB}/networkx/generators/tests/test_degree_seq.pyc
 ${PYSITELIB}/networkx/generators/tests/test_degree_seq.pyo
+${PYSITELIB}/networkx/generators/tests/test_directed.py
+${PYSITELIB}/networkx/generators/tests/test_directed.pyc
+${PYSITELIB}/networkx/generators/tests/test_directed.pyo
+${PYSITELIB}/networkx/generators/tests/test_ego.py
+${PYSITELIB}/networkx/generators/tests/test_ego.pyc
+${PYSITELIB}/networkx/generators/tests/test_ego.pyo
+${PYSITELIB}/networkx/generators/tests/test_geometric.py
+${PYSITELIB}/networkx/generators/tests/test_geometric.pyc
+${PYSITELIB}/networkx/generators/tests/test_geometric.pyo
+${PYSITELIB}/networkx/generators/tests/test_hybrid.py
+${PYSITELIB}/networkx/generators/tests/test_hybrid.pyc
+${PYSITELIB}/networkx/generators/tests/test_hybrid.pyo
+${PYSITELIB}/networkx/generators/tests/test_intersection.py
+${PYSITELIB}/networkx/generators/tests/test_intersection.pyc
+${PYSITELIB}/networkx/generators/tests/test_intersection.pyo
+${PYSITELIB}/networkx/generators/tests/test_line.py
+${PYSITELIB}/networkx/generators/tests/test_line.pyc
+${PYSITELIB}/networkx/generators/tests/test_line.pyo
+${PYSITELIB}/networkx/generators/tests/test_random_clustered.py
+${PYSITELIB}/networkx/generators/tests/test_random_clustered.pyc
+${PYSITELIB}/networkx/generators/tests/test_random_clustered.pyo
+${PYSITELIB}/networkx/generators/tests/test_random_graphs.py
+${PYSITELIB}/networkx/generators/tests/test_random_graphs.pyc
+${PYSITELIB}/networkx/generators/tests/test_random_graphs.pyo
+${PYSITELIB}/networkx/generators/tests/test_small.py
+${PYSITELIB}/networkx/generators/tests/test_small.pyc
+${PYSITELIB}/networkx/generators/tests/test_small.pyo
+${PYSITELIB}/networkx/generators/tests/test_stochastic.py
+${PYSITELIB}/networkx/generators/tests/test_stochastic.pyc
+${PYSITELIB}/networkx/generators/tests/test_stochastic.pyo
+${PYSITELIB}/networkx/generators/tests/test_threshold.py
+${PYSITELIB}/networkx/generators/tests/test_threshold.pyc
+${PYSITELIB}/networkx/generators/tests/test_threshold.pyo
 ${PYSITELIB}/networkx/generators/threshold.py
 ${PYSITELIB}/networkx/generators/threshold.pyc
 ${PYSITELIB}/networkx/generators/threshold.pyo
@@ -372,9 +616,21 @@ ${PYSITELIB}/networkx/linalg/__init__.pyo
 ${PYSITELIB}/networkx/linalg/attrmatrix.py
 ${PYSITELIB}/networkx/linalg/attrmatrix.pyc
 ${PYSITELIB}/networkx/linalg/attrmatrix.pyo
+${PYSITELIB}/networkx/linalg/graphmatrix.py
+${PYSITELIB}/networkx/linalg/graphmatrix.pyc
+${PYSITELIB}/networkx/linalg/graphmatrix.pyo
+${PYSITELIB}/networkx/linalg/laplacianmatrix.py
+${PYSITELIB}/networkx/linalg/laplacianmatrix.pyc
+${PYSITELIB}/networkx/linalg/laplacianmatrix.pyo
 ${PYSITELIB}/networkx/linalg/spectrum.py
 ${PYSITELIB}/networkx/linalg/spectrum.pyc
 ${PYSITELIB}/networkx/linalg/spectrum.pyo
+${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.py
+${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyc
+${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyo
+${PYSITELIB}/networkx/linalg/tests/test_laplaican.py
+${PYSITELIB}/networkx/linalg/tests/test_laplaican.pyc
+${PYSITELIB}/networkx/linalg/tests/test_laplaican.pyo
 ${PYSITELIB}/networkx/linalg/tests/test_spectrum.py
 ${PYSITELIB}/networkx/linalg/tests/test_spectrum.pyc
 ${PYSITELIB}/networkx/linalg/tests/test_spectrum.pyo
@@ -387,6 +643,9 @@ ${PYSITELIB}/networkx/readwrite/adjlist.pyo
 ${PYSITELIB}/networkx/readwrite/edgelist.py
 ${PYSITELIB}/networkx/readwrite/edgelist.pyc
 ${PYSITELIB}/networkx/readwrite/edgelist.pyo
+${PYSITELIB}/networkx/readwrite/gexf.py
+${PYSITELIB}/networkx/readwrite/gexf.pyc
+${PYSITELIB}/networkx/readwrite/gexf.pyo
 ${PYSITELIB}/networkx/readwrite/gml.py
 ${PYSITELIB}/networkx/readwrite/gml.pyc
 ${PYSITELIB}/networkx/readwrite/gml.pyo
@@ -396,9 +655,42 @@ ${PYSITELIB}/networkx/readwrite/gpickle.pyo
 ${PYSITELIB}/networkx/readwrite/graphml.py
 ${PYSITELIB}/networkx/readwrite/graphml.pyc
 ${PYSITELIB}/networkx/readwrite/graphml.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/__init__.py
+${PYSITELIB}/networkx/readwrite/json_graph/__init__.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/__init__.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/adjacency.py
+${PYSITELIB}/networkx/readwrite/json_graph/adjacency.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/adjacency.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/node_link.py
+${PYSITELIB}/networkx/readwrite/json_graph/node_link.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/node_link.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/serialize.py
+${PYSITELIB}/networkx/readwrite/json_graph/serialize.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/serialize.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_adjacency.py
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_adjacency.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_adjacency.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.py
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_serialize.py
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_serialize.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_serialize.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_tree.py
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_tree.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_tree.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/tree.py
+${PYSITELIB}/networkx/readwrite/json_graph/tree.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tree.pyo
 ${PYSITELIB}/networkx/readwrite/leda.py
 ${PYSITELIB}/networkx/readwrite/leda.pyc
 ${PYSITELIB}/networkx/readwrite/leda.pyo
+${PYSITELIB}/networkx/readwrite/multiline_adjlist.py
+${PYSITELIB}/networkx/readwrite/multiline_adjlist.pyc
+${PYSITELIB}/networkx/readwrite/multiline_adjlist.pyo
+${PYSITELIB}/networkx/readwrite/nx_shp.py
+${PYSITELIB}/networkx/readwrite/nx_shp.pyc
+${PYSITELIB}/networkx/readwrite/nx_shp.pyo
 ${PYSITELIB}/networkx/readwrite/nx_yaml.py
 ${PYSITELIB}/networkx/readwrite/nx_yaml.pyc
 ${PYSITELIB}/networkx/readwrite/nx_yaml.pyo
@@ -417,15 +709,39 @@ ${PYSITELIB}/networkx/readwrite/tests/test_adjlist.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_edgelist.py
 ${PYSITELIB}/networkx/readwrite/tests/test_edgelist.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_edgelist.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_gexf.py
+${PYSITELIB}/networkx/readwrite/tests/test_gexf.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_gexf.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_gml.py
 ${PYSITELIB}/networkx/readwrite/tests/test_gml.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_gml.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_gpickle.py
+${PYSITELIB}/networkx/readwrite/tests/test_gpickle.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_gpickle.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_graphml.py
 ${PYSITELIB}/networkx/readwrite/tests/test_graphml.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_graphml.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_leda.py
+${PYSITELIB}/networkx/readwrite/tests/test_leda.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_leda.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_p2g.py
+${PYSITELIB}/networkx/readwrite/tests/test_p2g.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_p2g.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_pajek.py
+${PYSITELIB}/networkx/readwrite/tests/test_pajek.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_pajek.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_shp.py
+${PYSITELIB}/networkx/readwrite/tests/test_shp.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_shp.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_sparsegraph6.py
+${PYSITELIB}/networkx/readwrite/tests/test_sparsegraph6.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_sparsegraph6.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_yaml.py
 ${PYSITELIB}/networkx/readwrite/tests/test_yaml.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_yaml.pyo
+${PYSITELIB}/networkx/relabel.py
+${PYSITELIB}/networkx/relabel.pyc
+${PYSITELIB}/networkx/relabel.pyo
 ${PYSITELIB}/networkx/release.py
 ${PYSITELIB}/networkx/release.pyc
 ${PYSITELIB}/networkx/release.pyo
@@ -438,21 +754,58 @@ ${PYSITELIB}/networkx/tests/benchmark.pyo
 ${PYSITELIB}/networkx/tests/test.py
 ${PYSITELIB}/networkx/tests/test.pyc
 ${PYSITELIB}/networkx/tests/test.pyo
+${PYSITELIB}/networkx/tests/test_convert.py
+${PYSITELIB}/networkx/tests/test_convert.pyc
+${PYSITELIB}/networkx/tests/test_convert.pyo
 ${PYSITELIB}/networkx/tests/test_convert_numpy.py
 ${PYSITELIB}/networkx/tests/test_convert_numpy.pyc
 ${PYSITELIB}/networkx/tests/test_convert_numpy.pyo
 ${PYSITELIB}/networkx/tests/test_convert_scipy.py
 ${PYSITELIB}/networkx/tests/test_convert_scipy.pyc
 ${PYSITELIB}/networkx/tests/test_convert_scipy.pyo
-${PYSITELIB}/networkx/utils.py
-${PYSITELIB}/networkx/utils.pyc
-${PYSITELIB}/networkx/utils.pyo
+${PYSITELIB}/networkx/tests/test_exceptions.py
+${PYSITELIB}/networkx/tests/test_exceptions.pyc
+${PYSITELIB}/networkx/tests/test_exceptions.pyo
+${PYSITELIB}/networkx/tests/test_relabel.py
+${PYSITELIB}/networkx/tests/test_relabel.pyc
+${PYSITELIB}/networkx/tests/test_relabel.pyo
+${PYSITELIB}/networkx/utils/__init__.py
+${PYSITELIB}/networkx/utils/__init__.pyc
+${PYSITELIB}/networkx/utils/__init__.pyo
+${PYSITELIB}/networkx/utils/decorators.py
+${PYSITELIB}/networkx/utils/decorators.pyc
+${PYSITELIB}/networkx/utils/decorators.pyo
+${PYSITELIB}/networkx/utils/misc.py
+${PYSITELIB}/networkx/utils/misc.pyc
+${PYSITELIB}/networkx/utils/misc.pyo
+${PYSITELIB}/networkx/utils/random_sequence.py
+${PYSITELIB}/networkx/utils/random_sequence.pyc
+${PYSITELIB}/networkx/utils/random_sequence.pyo
+${PYSITELIB}/networkx/utils/rcm.py
+${PYSITELIB}/networkx/utils/rcm.pyc
+${PYSITELIB}/networkx/utils/rcm.pyo
+${PYSITELIB}/networkx/utils/tests/test_decorators.py
+${PYSITELIB}/networkx/utils/tests/test_decorators.pyc
+${PYSITELIB}/networkx/utils/tests/test_decorators.pyo
+${PYSITELIB}/networkx/utils/tests/test_misc.py
+${PYSITELIB}/networkx/utils/tests/test_misc.pyc
+${PYSITELIB}/networkx/utils/tests/test_misc.pyo
+${PYSITELIB}/networkx/utils/tests/test_random_sequence.py
+${PYSITELIB}/networkx/utils/tests/test_random_sequence.pyc
+${PYSITELIB}/networkx/utils/tests/test_random_sequence.pyo
+${PYSITELIB}/networkx/utils/tests/test_rcm.py
+${PYSITELIB}/networkx/utils/tests/test_rcm.pyc
+${PYSITELIB}/networkx/utils/tests/test_rcm.pyo
+${PYSITELIB}/networkx/utils/union_find.py
+${PYSITELIB}/networkx/utils/union_find.pyc
+${PYSITELIB}/networkx/utils/union_find.pyo
 ${PYSITELIB}/networkx/version.py
 ${PYSITELIB}/networkx/version.pyc
 ${PYSITELIB}/networkx/version.pyo
 share/doc/networkx-${PKGVERSION}/INSTALL.txt
 share/doc/networkx-${PKGVERSION}/LICENSE.txt
 share/doc/networkx-${PKGVERSION}/README.txt
+share/doc/networkx-${PKGVERSION}/examples/3d_drawing/mayavi2_spring.py
 share/doc/networkx-${PKGVERSION}/examples/advanced/eigenvalues.py
 share/doc/networkx-${PKGVERSION}/examples/advanced/heavy_metal_umlaut.py
 share/doc/networkx-${PKGVERSION}/examples/advanced/iterated_dynamical_systems.py
@@ -460,6 +813,7 @@ share/doc/networkx-${PKGVERSION}/examples/algorithms/blockmodel.py
 share/doc/networkx-${PKGVERSION}/examples/algorithms/davis_club.py
 share/doc/networkx-${PKGVERSION}/examples/algorithms/hartford_drug.edgelist
 share/doc/networkx-${PKGVERSION}/examples/algorithms/krackhardt_centrality.py
+share/doc/networkx-${PKGVERSION}/examples/algorithms/rcm.py
 share/doc/networkx-${PKGVERSION}/examples/basic/properties.py
 share/doc/networkx-${PKGVERSION}/examples/basic/read_write.py
 share/doc/networkx-${PKGVERSION}/examples/drawing/atlas.py
@@ -477,7 +831,6 @@ share/doc/networkx-${PKGVERSION}/examples/drawing/knuth_miles.txt.gz
 share/doc/networkx-${PKGVERSION}/examples/drawing/labels_and_colors.py
 share/doc/networkx-${PKGVERSION}/examples/drawing/lanl_routes.edgelist
 share/doc/networkx-${PKGVERSION}/examples/drawing/lanl_routes.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/mayavi2_spring.py
 share/doc/networkx-${PKGVERSION}/examples/drawing/node_colormap.py
 share/doc/networkx-${PKGVERSION}/examples/drawing/random_geometric_graph.py
 share/doc/networkx-${PKGVERSION}/examples/drawing/sampson.py
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index ceb13305f07..57d06959872 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/08/27 03:09:18 gls Exp $
+$NetBSD: distinfo,v 1.4 2012/06/02 13:19:17 obache Exp $
 
-SHA1 (networkx-1.2.tar.gz) = 411880614b74f6fb0f844988b4c11bb736e067a6
-RMD160 (networkx-1.2.tar.gz) = df9d43c42d15a9a3bc0c46507f81c2df003f28b3
-Size (networkx-1.2.tar.gz) = 584719 bytes
+SHA1 (networkx-1.6.tar.gz) = cf43e0033e2499f77afb21eb4ecce1a94e4a8273
+RMD160 (networkx-1.6.tar.gz) = 95066c89565645bade07e520021d0249ce0955d8
+Size (networkx-1.6.tar.gz) = 707795 bytes