py-networkx: updated to 2.2

2.2:
This release is the result of 8 months of work with over 149 commits by
58 contributors. Highlights include:
- Add support for Python 3.7. This is the last release to support Python 2.
- Uniform random number generator (RNG) handling which defaults to global
  RNGs but allows specification of a single RNG for all random numbers in NX.
- Improved GraphViews to ease subclassing and remove cyclic references
  which caused trouble with deepcopy and pickle.
- New Graph method `G.update(H)`

4 files changed, 114 insertions, 107 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 68fda63cd9c..2a3efe586f3 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2018/05/07 15:27:09 khorben Exp $
+# $NetBSD: Makefile,v 1.27 2018/11/30 10:37:07 adam Exp $
 
-DISTNAME=	networkx-2.1
+DISTNAME=	networkx-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/networkx/}
 EXTRACT_SUFX=	.zip
@@ -12,42 +11,13 @@ HOMEPAGE=	http://networkx.github.io/
 COMMENT=	Python package for creating and manipulating graphs and networks
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-decorator>=4.1.0:../../devel/py-decorator
+DEPENDS+=	${PYPKGPREFIX}-decorator>=4.3.0:../../devel/py-decorator
+TEST_DEPENDS+=	${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
 
 USE_LANGUAGES=	# none
 
-REPLACE_INTERPRETER+=	python
-REPLACE.python.old=	/usr/bin/env python
-REPLACE.python.new=	${PYTHONBIN}
-REPLACE_FILES.python=	\
-examples/drawing/*.py \
-examples/advanced/*.py \
-examples/graph/*.py \
-examples/applications/*.py \
-examples/algorithms/*.py \
-examples/pygraphviz/*.py \
-examples/basic/*.py \
-examples/jit/*.py \
-doc/release/*.py \
-networkx/readwrite/tests/*.py \
-networkx/utils/tests/*.py \
-networkx/generators/tests/*.py \
-networkx/classes/tests/*.py \
-networkx/algorithms/components/tests/*.py \
-networkx/algorithms/isomorphism/tests/*.py \
-networkx/algorithms/link_analysis/tests/*.py \
-networkx/algorithms/centrality/tests/*.py \
-networkx/algorithms/bipartite/tests/*.py \
-networkx/algorithms/traversal/tests/*.py \
-networkx/algorithms/approximation/tests/*.py \
-networkx/algorithms/assortativity/tests/*.py \
-networkx/algorithms/shortest_paths/tests/*.py \
-networkx/algorithms/tests/*.py \
-networkx/tests/*.py
-
-post-install:
-	${RM} -f -r ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${MV} ${DESTDIR}${PREFIX}/share/doc/${DISTNAME} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+post-extract:
+	find ${WRKSRC} -type f -exec chmod 644 {} +
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index 301da3f6644..69ed0fa46b2 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2018/02/01 21:00:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/11/30 10:37:07 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -68,9 +68,15 @@ ${PYSITELIB}/networkx/algorithms/approximation/tests/test_ramsey.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_steinertree.py
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_steinertree.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_steinertree.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_treewidth.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_treewidth.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_treewidth.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_vertex_cover.py
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_vertex_cover.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_vertex_cover.pyo
+${PYSITELIB}/networkx/algorithms/approximation/treewidth.py
+${PYSITELIB}/networkx/algorithms/approximation/treewidth.pyc
+${PYSITELIB}/networkx/algorithms/approximation/treewidth.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/vertex_cover.py
 ${PYSITELIB}/networkx/algorithms/approximation/vertex_cover.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/vertex_cover.pyo
@@ -227,9 +233,15 @@ ${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/percolation.py
+${PYSITELIB}/networkx/algorithms/centrality/percolation.pyc
+${PYSITELIB}/networkx/algorithms/centrality/percolation.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/reaching.py
 ${PYSITELIB}/networkx/algorithms/centrality/reaching.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/reaching.pyo
+${PYSITELIB}/networkx/algorithms/centrality/second_order.py
+${PYSITELIB}/networkx/algorithms/centrality/second_order.pyc
+${PYSITELIB}/networkx/algorithms/centrality/second_order.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/subgraph_alg.py
 ${PYSITELIB}/networkx/algorithms/centrality/subgraph_alg.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/subgraph_alg.pyo
@@ -269,9 +281,15 @@ ${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/centrality/tests/test_percolation_centrality.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_percolation_centrality.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_percolation_centrality.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_second_order_centrality.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_second_order_centrality.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_second_order_centrality.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
@@ -305,9 +323,9 @@ ${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_fluid.py
+${PYSITELIB}/networkx/algorithms/community/asyn_fluid.pyc
+${PYSITELIB}/networkx/algorithms/community/asyn_fluid.pyo
 ${PYSITELIB}/networkx/algorithms/community/centrality.py
 ${PYSITELIB}/networkx/algorithms/community/centrality.pyc
 ${PYSITELIB}/networkx/algorithms/community/centrality.pyo
@@ -326,12 +344,15 @@ ${PYSITELIB}/networkx/algorithms/community/kernighan_lin.pyo
 ${PYSITELIB}/networkx/algorithms/community/label_propagation.py
 ${PYSITELIB}/networkx/algorithms/community/label_propagation.pyc
 ${PYSITELIB}/networkx/algorithms/community/label_propagation.pyo
+${PYSITELIB}/networkx/algorithms/community/modularity_max.py
+${PYSITELIB}/networkx/algorithms/community/modularity_max.pyc
+${PYSITELIB}/networkx/algorithms/community/modularity_max.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_fluid.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_fluid.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_asyn_fluid.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
@@ -347,6 +368,9 @@ ${PYSITELIB}/networkx/algorithms/community/tests/test_kernighan_lin.pyo
 ${PYSITELIB}/networkx/algorithms/community/tests/test_label_propagation.py
 ${PYSITELIB}/networkx/algorithms/community/tests/test_label_propagation.pyc
 ${PYSITELIB}/networkx/algorithms/community/tests/test_label_propagation.pyo
+${PYSITELIB}/networkx/algorithms/community/tests/test_modularity_max.py
+${PYSITELIB}/networkx/algorithms/community/tests/test_modularity_max.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/test_modularity_max.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
@@ -613,6 +637,24 @@ ${PYSITELIB}/networkx/algorithms/minors.pyo
 ${PYSITELIB}/networkx/algorithms/mis.py
 ${PYSITELIB}/networkx/algorithms/mis.pyc
 ${PYSITELIB}/networkx/algorithms/mis.pyo
+${PYSITELIB}/networkx/algorithms/node_classification/__init__.py
+${PYSITELIB}/networkx/algorithms/node_classification/__init__.pyc
+${PYSITELIB}/networkx/algorithms/node_classification/__init__.pyo
+${PYSITELIB}/networkx/algorithms/node_classification/hmn.py
+${PYSITELIB}/networkx/algorithms/node_classification/hmn.pyc
+${PYSITELIB}/networkx/algorithms/node_classification/hmn.pyo
+${PYSITELIB}/networkx/algorithms/node_classification/lgc.py
+${PYSITELIB}/networkx/algorithms/node_classification/lgc.pyc
+${PYSITELIB}/networkx/algorithms/node_classification/lgc.pyo
+${PYSITELIB}/networkx/algorithms/node_classification/tests/test_harmonic_function.py
+${PYSITELIB}/networkx/algorithms/node_classification/tests/test_harmonic_function.pyc
+${PYSITELIB}/networkx/algorithms/node_classification/tests/test_harmonic_function.pyo
+${PYSITELIB}/networkx/algorithms/node_classification/tests/test_local_and_global_consistency.py
+${PYSITELIB}/networkx/algorithms/node_classification/tests/test_local_and_global_consistency.pyc
+${PYSITELIB}/networkx/algorithms/node_classification/tests/test_local_and_global_consistency.pyo
+${PYSITELIB}/networkx/algorithms/node_classification/utils.py
+${PYSITELIB}/networkx/algorithms/node_classification/utils.pyc
+${PYSITELIB}/networkx/algorithms/node_classification/utils.pyo
 ${PYSITELIB}/networkx/algorithms/operators/__init__.py
 ${PYSITELIB}/networkx/algorithms/operators/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/operators/__init__.pyo
@@ -640,6 +682,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/planarity.py
+${PYSITELIB}/networkx/algorithms/planarity.pyc
+${PYSITELIB}/networkx/algorithms/planarity.pyo
 ${PYSITELIB}/networkx/algorithms/reciprocity.py
 ${PYSITELIB}/networkx/algorithms/reciprocity.pyc
 ${PYSITELIB}/networkx/algorithms/reciprocity.pyo
@@ -688,9 +733,15 @@ ${PYSITELIB}/networkx/algorithms/similarity.pyo
 ${PYSITELIB}/networkx/algorithms/simple_paths.py
 ${PYSITELIB}/networkx/algorithms/simple_paths.pyc
 ${PYSITELIB}/networkx/algorithms/simple_paths.pyo
+${PYSITELIB}/networkx/algorithms/smallworld.py
+${PYSITELIB}/networkx/algorithms/smallworld.pyc
+${PYSITELIB}/networkx/algorithms/smallworld.pyo
 ${PYSITELIB}/networkx/algorithms/smetric.py
 ${PYSITELIB}/networkx/algorithms/smetric.pyc
 ${PYSITELIB}/networkx/algorithms/smetric.pyo
+${PYSITELIB}/networkx/algorithms/sparsifiers.py
+${PYSITELIB}/networkx/algorithms/sparsifiers.pyc
+${PYSITELIB}/networkx/algorithms/sparsifiers.pyo
 ${PYSITELIB}/networkx/algorithms/structuralholes.py
 ${PYSITELIB}/networkx/algorithms/structuralholes.pyc
 ${PYSITELIB}/networkx/algorithms/structuralholes.pyo
@@ -778,6 +829,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_planarity.py
+${PYSITELIB}/networkx/algorithms/tests/test_planarity.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_planarity.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.py
 ${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.pyo
@@ -790,9 +844,15 @@ ${PYSITELIB}/networkx/algorithms/tests/test_similarity.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_simple_paths.py
 ${PYSITELIB}/networkx/algorithms/tests/test_simple_paths.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_simple_paths.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_smallworld.py
+${PYSITELIB}/networkx/algorithms/tests/test_smallworld.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_smallworld.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_sparsifiers.py
+${PYSITELIB}/networkx/algorithms/tests/test_sparsifiers.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_sparsifiers.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.py
 ${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.pyo
@@ -835,6 +895,9 @@ ${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/edgebfs.py
+${PYSITELIB}/networkx/algorithms/traversal/edgebfs.pyc
+${PYSITELIB}/networkx/algorithms/traversal/edgebfs.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.py
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.pyo
@@ -847,6 +910,9 @@ ${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/traversal/tests/test_edgebfs.py
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_edgebfs.pyc
+${PYSITELIB}/networkx/algorithms/traversal/tests/test_edgebfs.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/tests/test_edgedfs.py
 ${PYSITELIB}/networkx/algorithms/traversal/tests/test_edgedfs.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/tests/test_edgedfs.pyo
@@ -1070,6 +1136,9 @@ ${PYSITELIB}/networkx/generators/small.pyo
 ${PYSITELIB}/networkx/generators/social.py
 ${PYSITELIB}/networkx/generators/social.pyc
 ${PYSITELIB}/networkx/generators/social.pyo
+${PYSITELIB}/networkx/generators/spectral_graph_forge.py
+${PYSITELIB}/networkx/generators/spectral_graph_forge.pyc
+${PYSITELIB}/networkx/generators/spectral_graph_forge.pyo
 ${PYSITELIB}/networkx/generators/stochastic.py
 ${PYSITELIB}/networkx/generators/stochastic.pyc
 ${PYSITELIB}/networkx/generators/stochastic.pyo
@@ -1127,6 +1196,9 @@ ${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_spectral_graph_forge.py
+${PYSITELIB}/networkx/generators/tests/test_spectral_graph_forge.pyc
+${PYSITELIB}/networkx/generators/tests/test_spectral_graph_forge.pyo
 ${PYSITELIB}/networkx/generators/tests/test_stochastic.py
 ${PYSITELIB}/networkx/generators/tests/test_stochastic.pyc
 ${PYSITELIB}/networkx/generators/tests/test_stochastic.pyo
@@ -1316,6 +1388,9 @@ ${PYSITELIB}/networkx/tests/__init__.pyo
 ${PYSITELIB}/networkx/tests/test.py
 ${PYSITELIB}/networkx/tests/test.pyc
 ${PYSITELIB}/networkx/tests/test.pyo
+${PYSITELIB}/networkx/tests/test_all_random_functions.py
+${PYSITELIB}/networkx/tests/test_all_random_functions.pyc
+${PYSITELIB}/networkx/tests/test_all_random_functions.pyo
 ${PYSITELIB}/networkx/tests/test_convert.py
 ${PYSITELIB}/networkx/tests/test_convert.pyc
 ${PYSITELIB}/networkx/tests/test_convert.pyo
@@ -1346,6 +1421,9 @@ ${PYSITELIB}/networkx/utils/decorators.pyo
 ${PYSITELIB}/networkx/utils/heaps.py
 ${PYSITELIB}/networkx/utils/heaps.pyc
 ${PYSITELIB}/networkx/utils/heaps.pyo
+${PYSITELIB}/networkx/utils/mapped_queue.py
+${PYSITELIB}/networkx/utils/mapped_queue.pyc
+${PYSITELIB}/networkx/utils/mapped_queue.pyo
 ${PYSITELIB}/networkx/utils/misc.py
 ${PYSITELIB}/networkx/utils/misc.pyc
 ${PYSITELIB}/networkx/utils/misc.pyo
@@ -1364,6 +1442,9 @@ ${PYSITELIB}/networkx/utils/tests/test_decorators.pyo
 ${PYSITELIB}/networkx/utils/tests/test_heaps.py
 ${PYSITELIB}/networkx/utils/tests/test_heaps.pyc
 ${PYSITELIB}/networkx/utils/tests/test_heaps.pyo
+${PYSITELIB}/networkx/utils/tests/test_mapped_queue.py
+${PYSITELIB}/networkx/utils/tests/test_mapped_queue.pyc
+${PYSITELIB}/networkx/utils/tests/test_mapped_queue.pyo
 ${PYSITELIB}/networkx/utils/tests/test_misc.py
 ${PYSITELIB}/networkx/utils/tests/test_misc.pyc
 ${PYSITELIB}/networkx/utils/tests/test_misc.pyo
@@ -1382,62 +1463,3 @@ ${PYSITELIB}/networkx/utils/union_find.pyo
 ${PYSITELIB}/networkx/version.py
 ${PYSITELIB}/networkx/version.pyc
 ${PYSITELIB}/networkx/version.pyo
-share/doc/${PKGBASE}/LICENSE.txt
-share/doc/${PKGBASE}/examples/3d_drawing/mayavi2_spring.py
-share/doc/${PKGBASE}/examples/advanced/iterated_dynamical_systems.py
-share/doc/${PKGBASE}/examples/advanced/plot_eigenvalues.py
-share/doc/${PKGBASE}/examples/advanced/plot_heavy_metal_umlaut.py
-share/doc/${PKGBASE}/examples/advanced/plot_parallel_betweenness.py
-share/doc/${PKGBASE}/examples/algorithms/beam_search.py
-share/doc/${PKGBASE}/examples/algorithms/hartford_drug.edgelist
-share/doc/${PKGBASE}/examples/algorithms/plot_blockmodel.py
-share/doc/${PKGBASE}/examples/algorithms/plot_davis_club.py
-share/doc/${PKGBASE}/examples/algorithms/plot_krackhardt_centrality.py
-share/doc/${PKGBASE}/examples/algorithms/rcm.py
-share/doc/${PKGBASE}/examples/basic/plot_properties.py
-share/doc/${PKGBASE}/examples/basic/plot_read_write.py
-share/doc/${PKGBASE}/examples/drawing/chess_masters_WCC.pgn.bz2
-share/doc/${PKGBASE}/examples/drawing/knuth_miles.txt.gz
-share/doc/${PKGBASE}/examples/drawing/lanl_routes.edgelist
-share/doc/${PKGBASE}/examples/drawing/plot_atlas.py
-share/doc/${PKGBASE}/examples/drawing/plot_chess_masters.py
-share/doc/${PKGBASE}/examples/drawing/plot_circular_tree.py
-share/doc/${PKGBASE}/examples/drawing/plot_degree_histogram.py
-share/doc/${PKGBASE}/examples/drawing/plot_degree_rank.py
-share/doc/${PKGBASE}/examples/drawing/plot_directed.py
-share/doc/${PKGBASE}/examples/drawing/plot_edge_colormap.py
-share/doc/${PKGBASE}/examples/drawing/plot_ego_graph.py
-share/doc/${PKGBASE}/examples/drawing/plot_four_grids.py
-share/doc/${PKGBASE}/examples/drawing/plot_giant_component.py
-share/doc/${PKGBASE}/examples/drawing/plot_house_with_colors.py
-share/doc/${PKGBASE}/examples/drawing/plot_knuth_miles.py
-share/doc/${PKGBASE}/examples/drawing/plot_labels_and_colors.py
-share/doc/${PKGBASE}/examples/drawing/plot_lanl_routes.py
-share/doc/${PKGBASE}/examples/drawing/plot_node_colormap.py
-share/doc/${PKGBASE}/examples/drawing/plot_random_geometric_graph.py
-share/doc/${PKGBASE}/examples/drawing/plot_sampson.py
-share/doc/${PKGBASE}/examples/drawing/plot_simple_path.py
-share/doc/${PKGBASE}/examples/drawing/plot_spectral_grid.py
-share/doc/${PKGBASE}/examples/drawing/plot_unix_email.py
-share/doc/${PKGBASE}/examples/drawing/plot_weighted_graph.py
-share/doc/${PKGBASE}/examples/drawing/unix_email.mbox
-share/doc/${PKGBASE}/examples/graph/atlas2.py
-share/doc/${PKGBASE}/examples/graph/expected_degree_sequence.py
-share/doc/${PKGBASE}/examples/graph/plot_degree_sequence.py
-share/doc/${PKGBASE}/examples/graph/plot_erdos_renyi.py
-share/doc/${PKGBASE}/examples/graph/plot_football.py
-share/doc/${PKGBASE}/examples/graph/plot_karate_club.py
-share/doc/${PKGBASE}/examples/graph/plot_napoleon_russian_campaign.py
-share/doc/${PKGBASE}/examples/graph/plot_roget.py
-share/doc/${PKGBASE}/examples/graph/roget_dat.txt.gz
-share/doc/${PKGBASE}/examples/graph/words.py
-share/doc/${PKGBASE}/examples/graph/words_dat.txt.gz
-share/doc/${PKGBASE}/examples/javascript/force.py
-share/doc/${PKGBASE}/examples/jit/plot_rgraph.py
-share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_attributes.py
-share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_draw.py
-share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_simple.py
-share/doc/${PKGBASE}/examples/pygraphviz/write_dotfile.py
-share/doc/${PKGBASE}/examples/subclass/plot_antigraph.py
-share/doc/${PKGBASE}/examples/subclass/plot_printgraph.py
-share/doc/${PKGBASE}/requirements.txt
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 79e110913a6..b601e517d85 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2018/02/01 21:00:25 adam Exp $
+$NetBSD: distinfo,v 1.12 2018/11/30 10:37:07 adam Exp $
 
-SHA1 (networkx-2.1.zip) = a481bea7b41c0d6af191c7d2bcde56d75da20b3e
-RMD160 (networkx-2.1.zip) = 52295c8c57b4e6897244f0129f396af2c5114997
-SHA512 (networkx-2.1.zip) = 61b819ccfdd38e009e5b363f4bf551f2924bbf751b078aab1b41da9faf4c6b0841f38750b96bd359d3aebefef01e65e88b4c43a378ec25bbd45283d92bdae678
-Size (networkx-2.1.zip) = 1612593 bytes
+SHA1 (networkx-2.2.zip) = a68f8faa3726c220b93d68cfa28bed24874ba3fc
+RMD160 (networkx-2.2.zip) = 255c9146174fb6aa67378001648a00335b4f2392
+SHA512 (networkx-2.2.zip) = 098e58c5f93c72c789e736102815e2f6388eb34147a674941519ef6f6d6452cc09b76d8523893418cb69df133e7623ea2c62fa51144f598f592ebce0e3e3ccbb
+Size (networkx-2.2.zip) = 1700336 bytes
+SHA1 (patch-setup.py) = 7996c9a19da1da3b017f6e646d37d085e42bfb82
diff --git a/math/py-networkx/patches/patch-setup.py b/math/py-networkx/patches/patch-setup.py
new file mode 100644
index 00000000000..365a1ce3a22
--- /dev/null
+++ b/math/py-networkx/patches/patch-setup.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2018/11/30 10:37:07 adam Exp $
+
+Do not install examples; they have different requirements.
+
+--- setup.py.orig	2018-11-30 10:28:52.000000000 +0000
++++ setup.py
+@@ -150,7 +150,6 @@ if __name__ == "__main__":
+         download_url=release.download_url,
+         classifiers=release.classifiers,
+         packages=packages,
+-        data_files=data,
+         package_data=package_data,
+         install_requires=install_requires,
+         extras_require=extras_require,