py-networkx: update to 2.0

NetworkX 2.0
Support for Python 3.6 added, drop support for Python 3.3.

3 files changed, 335 insertions, 117 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 7b2d14f5d7c..0527dd1ce12 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,41 +1,38 @@
-# $NetBSD: Makefile,v 1.22 2016/09/11 16:55:17 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/09/27 13:25:54 adam Exp $
 
-DISTNAME=	networkx-1.11
+DISTNAME=	networkx-2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/networkx/}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://networkx.github.io/
 COMMENT=	Python package for creating and manipulating graphs and networks
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-decorator>=4.0.10:../../devel/py-decorator
-BUILD_DEPENDS+=	${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
+DEPENDS+=	${PYPKGPREFIX}-decorator>=4.1.0:../../devel/py-decorator
 
 USE_LANGUAGES=	# none
 
-SUBST_CLASSES+=		python
-SUBST_STAGE.python=	post-patch
-SUBST_FILES.python+=	networkx/readwrite/tests/*.py
-SUBST_FILES.python+=	networkx/utils/tests/*.py
-SUBST_FILES.python+=	networkx/tests/*.py
-SUBST_FILES.python+=	networkx/generators/tests/*.py
-SUBST_FILES.python+=	networkx/classes/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/approximation/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/assortativity/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/bipartite/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/centrality/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/chordal/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/community/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/components/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/isomorphism/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/link_analysis/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/shortest_paths/tests/*.py
-SUBST_FILES.python+=	networkx/algorithms/traversal/tests/*.py
-SUBST_MESSAGE.python=	Fixing path to Python interpreter.
-SUBST_SED.python=	-e "s,/usr/bin/env python,${PYTHONBIN},g"
+REPLACE_PYTHON+=	networkx/algorithms/approximation/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/assortativity/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/bipartite/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/centrality/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/chordal/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/community/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/components/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/isomorphism/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/link_analysis/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/shortest_paths/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/tests/*.py
+REPLACE_PYTHON+=	networkx/algorithms/traversal/tests/*.py
+REPLACE_PYTHON+=	networkx/classes/tests/*.py
+REPLACE_PYTHON+=	networkx/generators/tests/*.py
+REPLACE_PYTHON+=	networkx/readwrite/tests/*.py
+REPLACE_PYTHON+=	networkx/tests/*.py
+REPLACE_PYTHON+=	networkx/utils/tests/*.py
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index f01a275dd1e..15f2009bcdc 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2016/08/12 13:38:22 wen Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/09/27 13:25:54 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -116,6 +116,9 @@ ${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/covering.py
+${PYSITELIB}/networkx/algorithms/bipartite/covering.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/covering.pyo
 ${PYSITELIB}/networkx/algorithms/bipartite/edgelist.py
 ${PYSITELIB}/networkx/algorithms/bipartite/edgelist.pyc
 ${PYSITELIB}/networkx/algorithms/bipartite/edgelist.pyo
@@ -146,6 +149,9 @@ ${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_covering.py
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_covering.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/tests/test_covering.pyo
 ${PYSITELIB}/networkx/algorithms/bipartite/tests/test_edgelist.py
 ${PYSITELIB}/networkx/algorithms/bipartite/tests/test_edgelist.pyc
 ${PYSITELIB}/networkx/algorithms/bipartite/tests/test_edgelist.pyo
@@ -167,12 +173,12 @@ ${PYSITELIB}/networkx/algorithms/bipartite/tests/test_redundancy.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
 ${PYSITELIB}/networkx/algorithms/boundary.py
 ${PYSITELIB}/networkx/algorithms/boundary.pyc
 ${PYSITELIB}/networkx/algorithms/boundary.pyo
+${PYSITELIB}/networkx/algorithms/bridges.py
+${PYSITELIB}/networkx/algorithms/bridges.pyc
+${PYSITELIB}/networkx/algorithms/bridges.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/__init__.py
 ${PYSITELIB}/networkx/algorithms/centrality/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/__init__.pyo
@@ -185,9 +191,6 @@ ${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
@@ -218,6 +221,12 @@ ${PYSITELIB}/networkx/algorithms/centrality/katz.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/load.py
 ${PYSITELIB}/networkx/algorithms/centrality/load.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/load.pyo
+${PYSITELIB}/networkx/algorithms/centrality/reaching.py
+${PYSITELIB}/networkx/algorithms/centrality/reaching.pyc
+${PYSITELIB}/networkx/algorithms/centrality/reaching.pyo
+${PYSITELIB}/networkx/algorithms/centrality/subgraph_alg.py
+${PYSITELIB}/networkx/algorithms/centrality/subgraph_alg.pyc
+${PYSITELIB}/networkx/algorithms/centrality/subgraph_alg.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality.pyo
@@ -227,9 +236,6 @@ ${PYSITELIB}/networkx/algorithms/centrality/tests/test_betweenness_centrality_su
 ${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
@@ -257,15 +263,18 @@ ${PYSITELIB}/networkx/algorithms/centrality/tests/test_katz_centrality.pyo
 ${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/centrality/tests/test_reaching.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_reaching.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_reaching.pyo
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_subgraph.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_subgraph.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_subgraph.pyo
+${PYSITELIB}/networkx/algorithms/chains.py
+${PYSITELIB}/networkx/algorithms/chains.pyc
+${PYSITELIB}/networkx/algorithms/chains.pyo
+${PYSITELIB}/networkx/algorithms/chordal.py
+${PYSITELIB}/networkx/algorithms/chordal.pyc
+${PYSITELIB}/networkx/algorithms/chordal.pyo
 ${PYSITELIB}/networkx/algorithms/clique.py
 ${PYSITELIB}/networkx/algorithms/clique.pyc
 ${PYSITELIB}/networkx/algorithms/clique.pyo
@@ -284,15 +293,60 @@ ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring_with_interchange.pyo
 ${PYSITELIB}/networkx/algorithms/coloring/tests/test_coloring.py
 ${PYSITELIB}/networkx/algorithms/coloring/tests/test_coloring.pyc
 ${PYSITELIB}/networkx/algorithms/coloring/tests/test_coloring.pyo
+${PYSITELIB}/networkx/algorithms/communicability_alg.py
+${PYSITELIB}/networkx/algorithms/communicability_alg.pyc
+${PYSITELIB}/networkx/algorithms/communicability_alg.pyo
 ${PYSITELIB}/networkx/algorithms/community/__init__.py
 ${PYSITELIB}/networkx/algorithms/community/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/community/__init__.pyo
+${PYSITELIB}/networkx/algorithms/community/asyn_fluidc.py
+${PYSITELIB}/networkx/algorithms/community/asyn_fluidc.pyc
+${PYSITELIB}/networkx/algorithms/community/asyn_fluidc.pyo
+${PYSITELIB}/networkx/algorithms/community/asyn_lpa.py
+${PYSITELIB}/networkx/algorithms/community/asyn_lpa.pyc
+${PYSITELIB}/networkx/algorithms/community/asyn_lpa.pyo
+${PYSITELIB}/networkx/algorithms/community/centrality.py
+${PYSITELIB}/networkx/algorithms/community/centrality.pyc
+${PYSITELIB}/networkx/algorithms/community/centrality.pyo
+${PYSITELIB}/networkx/algorithms/community/community_generators.py
+${PYSITELIB}/networkx/algorithms/community/community_generators.pyc
+${PYSITELIB}/networkx/algorithms/community/community_generators.pyo
+${PYSITELIB}/networkx/algorithms/community/community_utils.py
+${PYSITELIB}/networkx/algorithms/community/community_utils.pyc
+${PYSITELIB}/networkx/algorithms/community/community_utils.pyo
 ${PYSITELIB}/networkx/algorithms/community/kclique.py
 ${PYSITELIB}/networkx/algorithms/community/kclique.pyc
 ${PYSITELIB}/networkx/algorithms/community/kclique.pyo
+${PYSITELIB}/networkx/algorithms/community/kernighan_lin.py
+${PYSITELIB}/networkx/algorithms/community/kernighan_lin.pyc
+${PYSITELIB}/networkx/algorithms/community/kernighan_lin.pyo
+${PYSITELIB}/networkx/algorithms/community/quality.py
+${PYSITELIB}/networkx/algorithms/community/quality.pyc
+${PYSITELIB}/networkx/algorithms/community/quality.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_fluidc.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_fluidc.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_fluidc.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_lpa.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_lpa.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_lpa.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_centrality.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_centrality.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_centrality.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_generators.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_generators.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_generators.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/community/tests/test_kernighan_lin.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_kernighan_lin.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_kernighan_lin.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_quality.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_quality.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_quality.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_utils.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_utils.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_utils.pyo
 ${PYSITELIB}/networkx/algorithms/components/__init__.py
 ${PYSITELIB}/networkx/algorithms/components/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/components/__init__.pyo
@@ -344,6 +398,9 @@ ${PYSITELIB}/networkx/algorithms/connectivity/connectivity.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/cuts.py
 ${PYSITELIB}/networkx/algorithms/connectivity/cuts.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/cuts.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/edge_kcomponents.py
+${PYSITELIB}/networkx/algorithms/connectivity/edge_kcomponents.pyc
+${PYSITELIB}/networkx/algorithms/connectivity/edge_kcomponents.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/kcomponents.py
 ${PYSITELIB}/networkx/algorithms/connectivity/kcomponents.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/kcomponents.pyo
@@ -359,6 +416,9 @@ ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_connectivity.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_cuts.py
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_cuts.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_cuts.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/tests/test_edge_kcomponents.py
+${PYSITELIB}/networkx/algorithms/connectivity/tests/test_edge_kcomponents.pyc
+${PYSITELIB}/networkx/algorithms/connectivity/tests/test_edge_kcomponents.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_kcomponents.py
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_kcomponents.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_kcomponents.pyo
@@ -374,6 +434,12 @@ ${PYSITELIB}/networkx/algorithms/connectivity/utils.pyo
 ${PYSITELIB}/networkx/algorithms/core.py
 ${PYSITELIB}/networkx/algorithms/core.pyc
 ${PYSITELIB}/networkx/algorithms/core.pyo
+${PYSITELIB}/networkx/algorithms/covering.py
+${PYSITELIB}/networkx/algorithms/covering.pyc
+${PYSITELIB}/networkx/algorithms/covering.pyo
+${PYSITELIB}/networkx/algorithms/cuts.py
+${PYSITELIB}/networkx/algorithms/cuts.pyc
+${PYSITELIB}/networkx/algorithms/cuts.pyo
 ${PYSITELIB}/networkx/algorithms/cycles.py
 ${PYSITELIB}/networkx/algorithms/cycles.pyc
 ${PYSITELIB}/networkx/algorithms/cycles.pyo
@@ -392,18 +458,30 @@ ${PYSITELIB}/networkx/algorithms/dominance.pyo
 ${PYSITELIB}/networkx/algorithms/dominating.py
 ${PYSITELIB}/networkx/algorithms/dominating.pyc
 ${PYSITELIB}/networkx/algorithms/dominating.pyo
+${PYSITELIB}/networkx/algorithms/efficiency.py
+${PYSITELIB}/networkx/algorithms/efficiency.pyc
+${PYSITELIB}/networkx/algorithms/efficiency.pyo
 ${PYSITELIB}/networkx/algorithms/euler.py
 ${PYSITELIB}/networkx/algorithms/euler.pyc
 ${PYSITELIB}/networkx/algorithms/euler.pyo
 ${PYSITELIB}/networkx/algorithms/flow/__init__.py
 ${PYSITELIB}/networkx/algorithms/flow/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/flow/__init__.pyo
+${PYSITELIB}/networkx/algorithms/flow/boykovkolmogorov.py
+${PYSITELIB}/networkx/algorithms/flow/boykovkolmogorov.pyc
+${PYSITELIB}/networkx/algorithms/flow/boykovkolmogorov.pyo
 ${PYSITELIB}/networkx/algorithms/flow/capacityscaling.py
 ${PYSITELIB}/networkx/algorithms/flow/capacityscaling.pyc
 ${PYSITELIB}/networkx/algorithms/flow/capacityscaling.pyo
+${PYSITELIB}/networkx/algorithms/flow/dinitz_alg.py
+${PYSITELIB}/networkx/algorithms/flow/dinitz_alg.pyc
+${PYSITELIB}/networkx/algorithms/flow/dinitz_alg.pyo
 ${PYSITELIB}/networkx/algorithms/flow/edmondskarp.py
 ${PYSITELIB}/networkx/algorithms/flow/edmondskarp.pyc
 ${PYSITELIB}/networkx/algorithms/flow/edmondskarp.pyo
+${PYSITELIB}/networkx/algorithms/flow/gomory_hu.py
+${PYSITELIB}/networkx/algorithms/flow/gomory_hu.pyc
+${PYSITELIB}/networkx/algorithms/flow/gomory_hu.pyo
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.py
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.pyc
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.pyo
@@ -422,6 +500,9 @@ ${PYSITELIB}/networkx/algorithms/flow/shortestaugmentingpath.pyo
 ${PYSITELIB}/networkx/algorithms/flow/tests/gl1.gpickle.bz2
 ${PYSITELIB}/networkx/algorithms/flow/tests/gw1.gpickle.bz2
 ${PYSITELIB}/networkx/algorithms/flow/tests/netgen-2.gpickle.bz2
+${PYSITELIB}/networkx/algorithms/flow/tests/test_gomory_hu.py
+${PYSITELIB}/networkx/algorithms/flow/tests/test_gomory_hu.pyc
+${PYSITELIB}/networkx/algorithms/flow/tests/test_gomory_hu.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
@@ -459,6 +540,9 @@ ${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/temporalisomorphvf2.py
+${PYSITELIB}/networkx/algorithms/isomorphism/temporalisomorphvf2.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/temporalisomorphvf2.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
@@ -469,6 +553,12 @@ ${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_match_helpers.py
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_match_helpers.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_match_helpers.pyo
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_temporalisomorphvf2.py
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_temporalisomorphvf2.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_temporalisomorphvf2.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
@@ -493,6 +583,9 @@ ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_pagerank.pyo
 ${PYSITELIB}/networkx/algorithms/link_prediction.py
 ${PYSITELIB}/networkx/algorithms/link_prediction.pyc
 ${PYSITELIB}/networkx/algorithms/link_prediction.pyo
+${PYSITELIB}/networkx/algorithms/lowest_common_ancestors.py
+${PYSITELIB}/networkx/algorithms/lowest_common_ancestors.pyc
+${PYSITELIB}/networkx/algorithms/lowest_common_ancestors.pyo
 ${PYSITELIB}/networkx/algorithms/matching.py
 ${PYSITELIB}/networkx/algorithms/matching.pyc
 ${PYSITELIB}/networkx/algorithms/matching.pyo
@@ -502,9 +595,6 @@ ${PYSITELIB}/networkx/algorithms/minors.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/__init__.py
 ${PYSITELIB}/networkx/algorithms/operators/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/operators/__init__.pyo
@@ -532,6 +622,9 @@ ${PYSITELIB}/networkx/algorithms/operators/tests/test_unary.pyo
 ${PYSITELIB}/networkx/algorithms/operators/unary.py
 ${PYSITELIB}/networkx/algorithms/operators/unary.pyc
 ${PYSITELIB}/networkx/algorithms/operators/unary.pyo
+${PYSITELIB}/networkx/algorithms/reciprocity.py
+${PYSITELIB}/networkx/algorithms/reciprocity.pyc
+${PYSITELIB}/networkx/algorithms/reciprocity.pyo
 ${PYSITELIB}/networkx/algorithms/richclub.py
 ${PYSITELIB}/networkx/algorithms/richclub.pyc
 ${PYSITELIB}/networkx/algorithms/richclub.pyo
@@ -577,24 +670,42 @@ ${PYSITELIB}/networkx/algorithms/simple_paths.pyo
 ${PYSITELIB}/networkx/algorithms/smetric.py
 ${PYSITELIB}/networkx/algorithms/smetric.pyc
 ${PYSITELIB}/networkx/algorithms/smetric.pyo
+${PYSITELIB}/networkx/algorithms/structuralholes.py
+${PYSITELIB}/networkx/algorithms/structuralholes.pyc
+${PYSITELIB}/networkx/algorithms/structuralholes.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_bridges.py
+${PYSITELIB}/networkx/algorithms/tests/test_bridges.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_bridges.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_chains.py
+${PYSITELIB}/networkx/algorithms/tests/test_chains.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_chains.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_chordal.py
+${PYSITELIB}/networkx/algorithms/tests/test_chordal.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_chordal.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_communicability.py
+${PYSITELIB}/networkx/algorithms/tests/test_communicability.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_communicability.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_covering.py
+${PYSITELIB}/networkx/algorithms/tests/test_covering.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_covering.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_cuts.py
+${PYSITELIB}/networkx/algorithms/tests/test_cuts.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_cuts.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_cycles.py
 ${PYSITELIB}/networkx/algorithms/tests/test_cycles.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_cycles.pyo
@@ -613,6 +724,9 @@ ${PYSITELIB}/networkx/algorithms/tests/test_dominance.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_dominating.py
 ${PYSITELIB}/networkx/algorithms/tests/test_dominating.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_dominating.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_efficiency.py
+${PYSITELIB}/networkx/algorithms/tests/test_efficiency.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_efficiency.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.py
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.pyo
@@ -625,9 +739,15 @@ ${PYSITELIB}/networkx/algorithms/tests/test_hierarchy.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_hybrid.py
 ${PYSITELIB}/networkx/algorithms/tests/test_hybrid.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_hybrid.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_isolate.py
+${PYSITELIB}/networkx/algorithms/tests/test_isolate.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_isolate.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_link_prediction.py
 ${PYSITELIB}/networkx/algorithms/tests/test_link_prediction.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_link_prediction.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_lowest_common_ancestors.py
+${PYSITELIB}/networkx/algorithms/tests/test_lowest_common_ancestors.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_lowest_common_ancestors.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.py
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.pyo
@@ -637,9 +757,9 @@ ${PYSITELIB}/networkx/algorithms/tests/test_minors.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_reciprocity.py
+${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_richclub.py
 ${PYSITELIB}/networkx/algorithms/tests/test_richclub.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_richclub.pyo
@@ -649,18 +769,42 @@ ${PYSITELIB}/networkx/algorithms/tests/test_simple_paths.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_structuralholes.py
+${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.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_threshold.py
+${PYSITELIB}/networkx/algorithms/tests/test_threshold.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_threshold.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_tournament.py
+${PYSITELIB}/networkx/algorithms/tests/test_tournament.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_tournament.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_triads.py
 ${PYSITELIB}/networkx/algorithms/tests/test_triads.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_triads.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/tests/test_voronoi.py
+${PYSITELIB}/networkx/algorithms/tests/test_voronoi.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_voronoi.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_wiener.py
+${PYSITELIB}/networkx/algorithms/tests/test_wiener.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_wiener.pyo
+${PYSITELIB}/networkx/algorithms/threshold.py
+${PYSITELIB}/networkx/algorithms/threshold.pyc
+${PYSITELIB}/networkx/algorithms/threshold.pyo
+${PYSITELIB}/networkx/algorithms/tournament.py
+${PYSITELIB}/networkx/algorithms/tournament.pyc
+${PYSITELIB}/networkx/algorithms/tournament.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/__init__.py
 ${PYSITELIB}/networkx/algorithms/traversal/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/__init__.pyo
+${PYSITELIB}/networkx/algorithms/traversal/beamsearch.py
+${PYSITELIB}/networkx/algorithms/traversal/beamsearch.pyc
+${PYSITELIB}/networkx/algorithms/traversal/beamsearch.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
@@ -670,6 +814,9 @@ ${PYSITELIB}/networkx/algorithms/traversal/depth_first_search.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.py
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.pyo
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_beamsearch.py
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_beamsearch.pyc
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_beamsearch.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
@@ -685,12 +832,30 @@ ${PYSITELIB}/networkx/algorithms/tree/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/tree/branchings.py
 ${PYSITELIB}/networkx/algorithms/tree/branchings.pyc
 ${PYSITELIB}/networkx/algorithms/tree/branchings.pyo
+${PYSITELIB}/networkx/algorithms/tree/coding.py
+${PYSITELIB}/networkx/algorithms/tree/coding.pyc
+${PYSITELIB}/networkx/algorithms/tree/coding.pyo
+${PYSITELIB}/networkx/algorithms/tree/mst.py
+${PYSITELIB}/networkx/algorithms/tree/mst.pyc
+${PYSITELIB}/networkx/algorithms/tree/mst.pyo
+${PYSITELIB}/networkx/algorithms/tree/operations.py
+${PYSITELIB}/networkx/algorithms/tree/operations.pyc
+${PYSITELIB}/networkx/algorithms/tree/operations.pyo
 ${PYSITELIB}/networkx/algorithms/tree/recognition.py
 ${PYSITELIB}/networkx/algorithms/tree/recognition.pyc
 ${PYSITELIB}/networkx/algorithms/tree/recognition.pyo
 ${PYSITELIB}/networkx/algorithms/tree/tests/test_branchings.py
 ${PYSITELIB}/networkx/algorithms/tree/tests/test_branchings.pyc
 ${PYSITELIB}/networkx/algorithms/tree/tests/test_branchings.pyo
+${PYSITELIB}/networkx/algorithms/tree/tests/test_coding.py
+${PYSITELIB}/networkx/algorithms/tree/tests/test_coding.pyc
+${PYSITELIB}/networkx/algorithms/tree/tests/test_coding.pyo
+${PYSITELIB}/networkx/algorithms/tree/tests/test_mst.py
+${PYSITELIB}/networkx/algorithms/tree/tests/test_mst.pyc
+${PYSITELIB}/networkx/algorithms/tree/tests/test_mst.pyo
+${PYSITELIB}/networkx/algorithms/tree/tests/test_operations.py
+${PYSITELIB}/networkx/algorithms/tree/tests/test_operations.pyc
+${PYSITELIB}/networkx/algorithms/tree/tests/test_operations.pyo
 ${PYSITELIB}/networkx/algorithms/tree/tests/test_recognition.py
 ${PYSITELIB}/networkx/algorithms/tree/tests/test_recognition.pyc
 ${PYSITELIB}/networkx/algorithms/tree/tests/test_recognition.pyo
@@ -700,18 +865,33 @@ ${PYSITELIB}/networkx/algorithms/triads.pyo
 ${PYSITELIB}/networkx/algorithms/vitality.py
 ${PYSITELIB}/networkx/algorithms/vitality.pyc
 ${PYSITELIB}/networkx/algorithms/vitality.pyo
+${PYSITELIB}/networkx/algorithms/voronoi.py
+${PYSITELIB}/networkx/algorithms/voronoi.pyc
+${PYSITELIB}/networkx/algorithms/voronoi.pyo
+${PYSITELIB}/networkx/algorithms/wiener.py
+${PYSITELIB}/networkx/algorithms/wiener.pyc
+${PYSITELIB}/networkx/algorithms/wiener.pyo
 ${PYSITELIB}/networkx/classes/__init__.py
 ${PYSITELIB}/networkx/classes/__init__.pyc
 ${PYSITELIB}/networkx/classes/__init__.pyo
+${PYSITELIB}/networkx/classes/coreviews.py
+${PYSITELIB}/networkx/classes/coreviews.pyc
+${PYSITELIB}/networkx/classes/coreviews.pyo
 ${PYSITELIB}/networkx/classes/digraph.py
 ${PYSITELIB}/networkx/classes/digraph.pyc
 ${PYSITELIB}/networkx/classes/digraph.pyo
+${PYSITELIB}/networkx/classes/filters.py
+${PYSITELIB}/networkx/classes/filters.pyc
+${PYSITELIB}/networkx/classes/filters.pyo
 ${PYSITELIB}/networkx/classes/function.py
 ${PYSITELIB}/networkx/classes/function.pyc
 ${PYSITELIB}/networkx/classes/function.pyo
 ${PYSITELIB}/networkx/classes/graph.py
 ${PYSITELIB}/networkx/classes/graph.pyc
 ${PYSITELIB}/networkx/classes/graph.pyo
+${PYSITELIB}/networkx/classes/graphviews.py
+${PYSITELIB}/networkx/classes/graphviews.pyc
+${PYSITELIB}/networkx/classes/graphviews.pyo
 ${PYSITELIB}/networkx/classes/multidigraph.py
 ${PYSITELIB}/networkx/classes/multidigraph.pyc
 ${PYSITELIB}/networkx/classes/multidigraph.pyo
@@ -721,15 +901,24 @@ ${PYSITELIB}/networkx/classes/multigraph.pyo
 ${PYSITELIB}/networkx/classes/ordered.py
 ${PYSITELIB}/networkx/classes/ordered.pyc
 ${PYSITELIB}/networkx/classes/ordered.pyo
+${PYSITELIB}/networkx/classes/reportviews.py
+${PYSITELIB}/networkx/classes/reportviews.pyc
+${PYSITELIB}/networkx/classes/reportviews.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_coreviews.py
+${PYSITELIB}/networkx/classes/tests/test_coreviews.pyc
+${PYSITELIB}/networkx/classes/tests/test_coreviews.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_filters.py
+${PYSITELIB}/networkx/classes/tests/test_filters.pyc
+${PYSITELIB}/networkx/classes/tests/test_filters.pyo
 ${PYSITELIB}/networkx/classes/tests/test_function.py
 ${PYSITELIB}/networkx/classes/tests/test_function.pyc
 ${PYSITELIB}/networkx/classes/tests/test_function.pyo
@@ -739,6 +928,9 @@ ${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_graphviews.py
+${PYSITELIB}/networkx/classes/tests/test_graphviews.pyc
+${PYSITELIB}/networkx/classes/tests/test_graphviews.pyo
 ${PYSITELIB}/networkx/classes/tests/test_multidigraph.py
 ${PYSITELIB}/networkx/classes/tests/test_multidigraph.pyc
 ${PYSITELIB}/networkx/classes/tests/test_multidigraph.pyo
@@ -748,15 +940,15 @@ ${PYSITELIB}/networkx/classes/tests/test_multigraph.pyo
 ${PYSITELIB}/networkx/classes/tests/test_ordered.py
 ${PYSITELIB}/networkx/classes/tests/test_ordered.pyc
 ${PYSITELIB}/networkx/classes/tests/test_ordered.pyo
+${PYSITELIB}/networkx/classes/tests/test_reportviews.py
+${PYSITELIB}/networkx/classes/tests/test_reportviews.pyc
+${PYSITELIB}/networkx/classes/tests/test_reportviews.pyo
 ${PYSITELIB}/networkx/classes/tests/test_special.py
 ${PYSITELIB}/networkx/classes/tests/test_special.pyc
 ${PYSITELIB}/networkx/classes/tests/test_special.pyo
-${PYSITELIB}/networkx/classes/tests/test_timing.py
-${PYSITELIB}/networkx/classes/tests/test_timing.pyc
-${PYSITELIB}/networkx/classes/tests/test_timing.pyo
-${PYSITELIB}/networkx/classes/tests/timingclasses.py
-${PYSITELIB}/networkx/classes/tests/timingclasses.pyc
-${PYSITELIB}/networkx/classes/tests/timingclasses.pyo
+${PYSITELIB}/networkx/classes/tests/test_subgraphviews.py
+${PYSITELIB}/networkx/classes/tests/test_subgraphviews.pyc
+${PYSITELIB}/networkx/classes/tests/test_subgraphviews.pyo
 ${PYSITELIB}/networkx/convert.py
 ${PYSITELIB}/networkx/convert.pyc
 ${PYSITELIB}/networkx/convert.pyo
@@ -793,12 +985,10 @@ ${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/generators/__init__.py
 ${PYSITELIB}/networkx/generators/__init__.pyc
 ${PYSITELIB}/networkx/generators/__init__.pyo
+${PYSITELIB}/networkx/generators/atlas.dat.gz
 ${PYSITELIB}/networkx/generators/atlas.py
 ${PYSITELIB}/networkx/generators/atlas.pyc
 ${PYSITELIB}/networkx/generators/atlas.pyo
@@ -814,6 +1004,9 @@ ${PYSITELIB}/networkx/generators/degree_seq.pyo
 ${PYSITELIB}/networkx/generators/directed.py
 ${PYSITELIB}/networkx/generators/directed.pyc
 ${PYSITELIB}/networkx/generators/directed.pyo
+${PYSITELIB}/networkx/generators/duplication.py
+${PYSITELIB}/networkx/generators/duplication.pyc
+${PYSITELIB}/networkx/generators/duplication.pyo
 ${PYSITELIB}/networkx/generators/ego.py
 ${PYSITELIB}/networkx/generators/ego.pyc
 ${PYSITELIB}/networkx/generators/ego.pyo
@@ -826,6 +1019,12 @@ ${PYSITELIB}/networkx/generators/geometric.pyo
 ${PYSITELIB}/networkx/generators/intersection.py
 ${PYSITELIB}/networkx/generators/intersection.pyc
 ${PYSITELIB}/networkx/generators/intersection.pyo
+${PYSITELIB}/networkx/generators/joint_degree_seq.py
+${PYSITELIB}/networkx/generators/joint_degree_seq.pyc
+${PYSITELIB}/networkx/generators/joint_degree_seq.pyo
+${PYSITELIB}/networkx/generators/lattice.py
+${PYSITELIB}/networkx/generators/lattice.pyc
+${PYSITELIB}/networkx/generators/lattice.pyo
 ${PYSITELIB}/networkx/generators/line.py
 ${PYSITELIB}/networkx/generators/line.pyc
 ${PYSITELIB}/networkx/generators/line.pyo
@@ -862,6 +1061,9 @@ ${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_duplication.py
+${PYSITELIB}/networkx/generators/tests/test_duplication.pyc
+${PYSITELIB}/networkx/generators/tests/test_duplication.pyo
 ${PYSITELIB}/networkx/generators/tests/test_ego.py
 ${PYSITELIB}/networkx/generators/tests/test_ego.pyc
 ${PYSITELIB}/networkx/generators/tests/test_ego.pyo
@@ -874,6 +1076,12 @@ ${PYSITELIB}/networkx/generators/tests/test_geometric.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_joint_degree_seq.py
+${PYSITELIB}/networkx/generators/tests/test_joint_degree_seq.pyc
+${PYSITELIB}/networkx/generators/tests/test_joint_degree_seq.pyo
+${PYSITELIB}/networkx/generators/tests/test_lattice.py
+${PYSITELIB}/networkx/generators/tests/test_lattice.pyc
+${PYSITELIB}/networkx/generators/tests/test_lattice.pyo
 ${PYSITELIB}/networkx/generators/tests/test_line.py
 ${PYSITELIB}/networkx/generators/tests/test_line.pyc
 ${PYSITELIB}/networkx/generators/tests/test_line.pyo
@@ -892,12 +1100,18 @@ ${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
+${PYSITELIB}/networkx/generators/tests/test_tree.py
+${PYSITELIB}/networkx/generators/tests/test_tree.pyc
+${PYSITELIB}/networkx/generators/tests/test_tree.pyo
+${PYSITELIB}/networkx/generators/tests/test_triads.py
+${PYSITELIB}/networkx/generators/tests/test_triads.pyc
+${PYSITELIB}/networkx/generators/tests/test_triads.pyo
+${PYSITELIB}/networkx/generators/tree.py
+${PYSITELIB}/networkx/generators/tree.pyc
+${PYSITELIB}/networkx/generators/tree.pyo
+${PYSITELIB}/networkx/generators/triads.py
+${PYSITELIB}/networkx/generators/triads.pyc
+${PYSITELIB}/networkx/generators/triads.pyo
 ${PYSITELIB}/networkx/linalg/__init__.py
 ${PYSITELIB}/networkx/linalg/__init__.pyc
 ${PYSITELIB}/networkx/linalg/__init__.pyo
@@ -964,12 +1178,24 @@ ${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/cytoscape.py
+${PYSITELIB}/networkx/readwrite/json_graph/cytoscape.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/cytoscape.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/jit.py
+${PYSITELIB}/networkx/readwrite/json_graph/jit.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/jit.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/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_cytoscape.py
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_cytoscape.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_cytoscape.pyo
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_jit.py
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_jit.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tests/test_jit.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
@@ -1057,9 +1283,6 @@ ${PYSITELIB}/networkx/testing/utils.pyo
 ${PYSITELIB}/networkx/tests/__init__.py
 ${PYSITELIB}/networkx/tests/__init__.pyc
 ${PYSITELIB}/networkx/tests/__init__.pyo
-${PYSITELIB}/networkx/tests/benchmark.py
-${PYSITELIB}/networkx/tests/benchmark.pyc
-${PYSITELIB}/networkx/tests/benchmark.pyo
 ${PYSITELIB}/networkx/tests/test.py
 ${PYSITELIB}/networkx/tests/test.pyc
 ${PYSITELIB}/networkx/tests/test.pyo
@@ -1129,62 +1352,60 @@ ${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}/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
-share/doc/networkx-${PKGVERSION}/examples/advanced/parallel_betweenness.py
-share/doc/networkx-${PKGVERSION}/examples/algorithms/blockmodel.py
-share/doc/networkx-${PKGVERSION}/examples/algorithms/davis_club.py
+share/doc/networkx-${PKGVERSION}/examples/advanced/plot_eigenvalues.py
+share/doc/networkx-${PKGVERSION}/examples/advanced/plot_heavy_metal_umlaut.py
+share/doc/networkx-${PKGVERSION}/examples/advanced/plot_parallel_betweenness.py
+share/doc/networkx-${PKGVERSION}/examples/algorithms/beam_search.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/plot_blockmodel.py
+share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_davis_club.py
+share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_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
-share/doc/networkx-${PKGVERSION}/examples/drawing/chess_masters.py
+share/doc/networkx-${PKGVERSION}/examples/basic/plot_properties.py
+share/doc/networkx-${PKGVERSION}/examples/basic/plot_read_write.py
 share/doc/networkx-${PKGVERSION}/examples/drawing/chess_masters_WCC.pgn.bz2
-share/doc/networkx-${PKGVERSION}/examples/drawing/circular_tree.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/degree_histogram.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/edge_colormap.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/ego_graph.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/four_grids.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/giant_component.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/house_with_colors.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/knuth_miles.py
 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/node_colormap.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/random_geometric_graph.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/sampson.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/simple_path.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_atlas.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_chess_masters.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_circular_tree.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_degree_histogram.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_degree_rank.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_edge_colormap.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_ego_graph.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_four_grids.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_giant_component.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_house_with_colors.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_knuth_miles.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_labels_and_colors.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_lanl_routes.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_node_colormap.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_random_geometric_graph.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_sampson.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_simple_path.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_unix_email.py
+share/doc/networkx-${PKGVERSION}/examples/drawing/plot_weighted_graph.py
 share/doc/networkx-${PKGVERSION}/examples/drawing/unix_email.mbox
-share/doc/networkx-${PKGVERSION}/examples/drawing/unix_email.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/weighted_graph.py
-share/doc/networkx-${PKGVERSION}/examples/graph/atlas.py
 share/doc/networkx-${PKGVERSION}/examples/graph/atlas2.py
-share/doc/networkx-${PKGVERSION}/examples/graph/degree_sequence.py
-share/doc/networkx-${PKGVERSION}/examples/graph/erdos_renyi.py
 share/doc/networkx-${PKGVERSION}/examples/graph/expected_degree_sequence.py
-share/doc/networkx-${PKGVERSION}/examples/graph/football.py
-share/doc/networkx-${PKGVERSION}/examples/graph/karate_club.py
-share/doc/networkx-${PKGVERSION}/examples/graph/knuth_miles.py
-share/doc/networkx-${PKGVERSION}/examples/graph/knuth_miles.txt.gz
-share/doc/networkx-${PKGVERSION}/examples/graph/napoleon_russian_campaign.py
-share/doc/networkx-${PKGVERSION}/examples/graph/roget.py
+share/doc/networkx-${PKGVERSION}/examples/graph/plot_degree_sequence.py
+share/doc/networkx-${PKGVERSION}/examples/graph/plot_erdos_renyi.py
+share/doc/networkx-${PKGVERSION}/examples/graph/plot_football.py
+share/doc/networkx-${PKGVERSION}/examples/graph/plot_karate_club.py
+share/doc/networkx-${PKGVERSION}/examples/graph/plot_napoleon_russian_campaign.py
+share/doc/networkx-${PKGVERSION}/examples/graph/plot_roget.py
 share/doc/networkx-${PKGVERSION}/examples/graph/roget_dat.txt.gz
-share/doc/networkx-${PKGVERSION}/examples/graph/unix_email.mbox
-share/doc/networkx-${PKGVERSION}/examples/graph/unix_email.py
 share/doc/networkx-${PKGVERSION}/examples/graph/words.py
 share/doc/networkx-${PKGVERSION}/examples/graph/words_dat.txt.gz
-share/doc/networkx-${PKGVERSION}/examples/multigraph/chess_masters.py
-share/doc/networkx-${PKGVERSION}/examples/multigraph/chess_masters_WCC.pgn.bz2
+share/doc/networkx-${PKGVERSION}/examples/javascript/force.py
+share/doc/networkx-${PKGVERSION}/examples/jit/plot_rgraph.py
 share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_attributes.py
 share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_draw.py
 share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_simple.py
 share/doc/networkx-${PKGVERSION}/examples/pygraphviz/write_dotfile.py
-@pkgdir share/doc/networkx-${PKGVERSION}/examples/readwrite
+share/doc/networkx-${PKGVERSION}/examples/subclass/plot_antigraph.py
+share/doc/networkx-${PKGVERSION}/examples/subclass/plot_printgraph.py
+share/doc/networkx-${PKGVERSION}/requirements.txt
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 75c4997c2bd..4724d47fcf7 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2016/08/12 13:38:22 wen Exp $
+$NetBSD: distinfo,v 1.10 2017/09/27 13:25:54 adam Exp $
 
-SHA1 (networkx-1.11.tar.gz) = ac24380b13dfe92633370ad2091c0c04b6d098a2
-RMD160 (networkx-1.11.tar.gz) = f8338d0bf5327dc29e25a7a94bfe363ca25d228b
-SHA512 (networkx-1.11.tar.gz) = 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
-Size (networkx-1.11.tar.gz) = 1315737 bytes
+SHA1 (networkx-2.0.zip) = 423ebfdf77ce6268273115a3d1e653ea6c9d3eb2
+RMD160 (networkx-2.0.zip) = 2118e59b4614b7f83d9ac6673ec00a78bc5b849d
+SHA512 (networkx-2.0.zip) = 44d0d26c0ec5424a32e74ac514f2281d4aded83711fc32a2b88dfcbeb1f41826bae7f7f53af89231a9dda76675b660e93587d3553c487d6aa1a65f635ac0ad1c
+Size (networkx-2.0.zip) = 1549125 bytes