3 files changed, 155 insertions, 71 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 9b5d60cf8561..ff658362a6a9 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	networkx
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	math python
 MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
 		CHEESESHOP
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index e2a35503a031..eb24873e32fb 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (networkx-1.6.tar.gz) = a2ee8399758e08bf7bc7910071474cdd92e364bbc22be1aa29bdfe0f26f7ba78
-SIZE (networkx-1.6.tar.gz) = 707795
+SHA256 (networkx-1.7.tar.gz) = eb62de98a0fa74aec9c31fffbac8089a703c6413601678f3fb1a0016bad2bdc1
+SIZE (networkx-1.7.tar.gz) = 728145
diff --git a/math/py-networkx/pkg-plist b/math/py-networkx/pkg-plist
index 2cd4906122f8..e7d1109c4b48 100644
--- a/math/py-networkx/pkg-plist
+++ b/math/py-networkx/pkg-plist
@@ -10,6 +10,45 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/clique.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/clique.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/clique.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/dominating_set.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/dominating_set.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/dominating_set.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/independent_set.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/independent_set.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/independent_set.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/matching.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/matching.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/matching.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/ramsey.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/ramsey.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/ramsey.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_clique.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_clique.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_clique.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_dominating_set.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_dominating_set.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_dominating_set.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_independent_set.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_independent_set.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_independent_set.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_matching.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_matching.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_matching.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_ramsey.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_ramsey.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_ramsey.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_vertex_cover.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_vertex_cover.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests/test_vertex_cover.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/vertex_cover.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/vertex_cover.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/vertex_cover.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/assortativity/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/assortativity/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/assortativity/__init__.pyo
@@ -250,6 +289,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/graphical.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/graphical.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/graphical.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/hierarchy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/hierarchy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/hierarchy.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/isolate.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/isolate.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/isolate.pyo
@@ -305,12 +347,33 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/mst.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/mst.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/mst.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/product.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/product.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/product.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/all.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/all.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/all.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/binary.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/binary.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/binary.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/product.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/product.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/product.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_all.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_all.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_all.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_binary.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_binary.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_binary.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_product.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_product.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_product.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_unary.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_unary.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests/test_unary.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/unary.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/unary.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/unary.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/richclub.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/richclub.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/richclub.pyo
@@ -332,6 +395,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_dense.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_dense.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_dense.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_dense_numpy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_dense_numpy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_dense_numpy.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_generic.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_generic.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests/test_generic.pyo
@@ -347,6 +413,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/weighted.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/weighted.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/weighted.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/simple_paths.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/simple_paths.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/simple_paths.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/smetric.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/smetric.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/smetric.pyo
@@ -386,6 +455,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_graphical.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_graphical.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_graphical.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_hierarchy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_hierarchy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_hierarchy.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_matching.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_matching.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_matching.pyo
@@ -395,15 +467,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_mst.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_mst.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_mst.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_operators.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_operators.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_operators.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_product.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_product.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_product.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_richclub.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_richclub.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_richclub.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_simple_paths.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_simple_paths.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_simple_paths.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_smetric.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_smetric.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests/test_smetric.pyo
@@ -749,6 +818,15 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/release.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/release.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/release.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/tests/test_utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/tests/test_utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/tests/test_utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/utils.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/tests/__init__.pyo
@@ -806,62 +884,62 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/version.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/version.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/version.pyo
-%%EXAMPLESDIR%%/3d_drawing/mayavi2_spring.py
-%%EXAMPLESDIR%%/advanced/eigenvalues.py
-%%EXAMPLESDIR%%/advanced/heavy_metal_umlaut.py
-%%EXAMPLESDIR%%/advanced/iterated_dynamical_systems.py
-%%EXAMPLESDIR%%/algorithms/blockmodel.py
-%%EXAMPLESDIR%%/algorithms/davis_club.py
-%%EXAMPLESDIR%%/algorithms/hartford_drug.edgelist
-%%EXAMPLESDIR%%/algorithms/krackhardt_centrality.py
-%%EXAMPLESDIR%%/algorithms/rcm.py
-%%EXAMPLESDIR%%/basic/properties.py
-%%EXAMPLESDIR%%/basic/read_write.py
-%%EXAMPLESDIR%%/drawing/atlas.py
-%%EXAMPLESDIR%%/drawing/chess_masters.py
-%%EXAMPLESDIR%%/drawing/circular_tree.py
-%%EXAMPLESDIR%%/drawing/degree_histogram.py
-%%EXAMPLESDIR%%/drawing/edge_colormap.py
-%%EXAMPLESDIR%%/drawing/ego_graph.py
-%%EXAMPLESDIR%%/drawing/four_grids.py
-%%EXAMPLESDIR%%/drawing/giant_component.py
-%%EXAMPLESDIR%%/drawing/house_with_colors.py
-%%EXAMPLESDIR%%/drawing/knuth_miles.py
-%%EXAMPLESDIR%%/drawing/labels_and_colors.py
-%%EXAMPLESDIR%%/drawing/lanl_routes.edgelist
-%%EXAMPLESDIR%%/drawing/lanl_routes.py
-%%EXAMPLESDIR%%/drawing/node_colormap.py
-%%EXAMPLESDIR%%/drawing/random_geometric_graph.py
-%%EXAMPLESDIR%%/drawing/sampson.py
-%%EXAMPLESDIR%%/drawing/sampson_data.zip
-%%EXAMPLESDIR%%/drawing/simple_path.py
-%%EXAMPLESDIR%%/drawing/unix_email.py
-%%EXAMPLESDIR%%/drawing/weighted_graph.py
-%%EXAMPLESDIR%%/graph/atlas.py
-%%EXAMPLESDIR%%/graph/atlas2.py
-%%EXAMPLESDIR%%/graph/degree_sequence.py
-%%EXAMPLESDIR%%/graph/erdos_renyi.py
-%%EXAMPLESDIR%%/graph/expected_degree_sequence.py
-%%EXAMPLESDIR%%/graph/football.py
-%%EXAMPLESDIR%%/graph/karate_club.py
-%%EXAMPLESDIR%%/graph/knuth_miles.py
-%%EXAMPLESDIR%%/graph/knuth_miles.txt.gz
-%%EXAMPLESDIR%%/graph/napoleon_russian_campaign.py
-%%EXAMPLESDIR%%/graph/roget.py
-%%EXAMPLESDIR%%/graph/roget_dat.txt.gz
-%%EXAMPLESDIR%%/graph/unix_email.mbox
-%%EXAMPLESDIR%%/graph/unix_email.py
-%%EXAMPLESDIR%%/graph/words.py
-%%EXAMPLESDIR%%/graph/words_dat.txt.gz
-%%EXAMPLESDIR%%/javascript/force.py
-%%EXAMPLESDIR%%/javascript/http_server.py
-%%EXAMPLESDIR%%/multigraph/chess_masters.py
-%%EXAMPLESDIR%%/multigraph/chess_masters_WCC.pgn.bz2
-%%EXAMPLESDIR%%/pygraphviz/pygraphviz_attributes.py
-%%EXAMPLESDIR%%/pygraphviz/pygraphviz_draw.py
-%%EXAMPLESDIR%%/pygraphviz/pygraphviz_simple.py
-%%EXAMPLESDIR%%/pygraphviz/write_dotfile.py
-%%EXAMPLESDIR%%/subclass/printgraph.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3d_drawing/mayavi2_spring.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/advanced/eigenvalues.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/advanced/heavy_metal_umlaut.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/advanced/iterated_dynamical_systems.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/algorithms/blockmodel.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/algorithms/davis_club.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/algorithms/hartford_drug.edgelist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/algorithms/krackhardt_centrality.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/algorithms/rcm.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/properties.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/read_write.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/atlas.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/chess_masters.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/circular_tree.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/degree_histogram.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/edge_colormap.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/ego_graph.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/four_grids.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/giant_component.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/house_with_colors.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/knuth_miles.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/labels_and_colors.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/lanl_routes.edgelist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/lanl_routes.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/node_colormap.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/random_geometric_graph.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/sampson.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/sampson_data.zip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/simple_path.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/unix_email.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawing/weighted_graph.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/atlas.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/atlas2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/degree_sequence.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/erdos_renyi.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/expected_degree_sequence.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/football.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/karate_club.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/knuth_miles.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/knuth_miles.txt.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/napoleon_russian_campaign.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/roget.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/roget_dat.txt.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/unix_email.mbox
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/unix_email.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/words.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph/words_dat.txt.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/force.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/http_server.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multigraph/chess_masters.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multigraph/chess_masters_WCC.pgn.bz2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygraphviz/pygraphviz_attributes.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygraphviz/pygraphviz_draw.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygraphviz/pygraphviz_simple.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygraphviz/write_dotfile.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subclass/printgraph.py
 @dirrm %%EXAMPLESDIR%%/subclass
 @dirrm %%EXAMPLESDIR%%/pygraphviz
 @dirrm %%EXAMPLESDIR%%/multigraph
@@ -876,6 +954,8 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/utils/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/utils
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/testing
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/readwrite/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/readwrite/json_graph/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/readwrite/json_graph
@@ -895,6 +975,8 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/shortest_paths
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/operators
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/link_analysis/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/link_analysis
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/isomorphism/tests
@@ -913,6 +995,8 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/bipartite
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/assortativity/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/assortativity
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms/approximation
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx/algorithms
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/networkx
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO