py-networkx: updated to 2.4

2.4:
This release is the result of 6 months of work with over 200 commits by
67 contributors. Highlights include:

- Remove deprecated code from 1.x
- Support for Python 3.8
- Switched to pytest for testing
- Last release to support Python 3.5

New Functions:

- barycenter functions
- Bethe Hessian matrix function
- Eulerian Path methods
- group centrality measures
- subgraph monomorphisms
- k-truss algorithms
- onion decomposition
- resistance distance
- asteroidal triples
- non-randomness measures
- linear prufing
- minimum weight bipartite matching
- Incremental closeness centrality
- ISMAGS subgraph isomorphism algorithm
- create chordal graph of a graph

New generators

- Binomial tree generator
- Directed joint degree generator
- Random internet AS graph generator

New for Layouts

- spiral node layout routine
- support for 3d layouts


Improvements
------------
- allow average shortest path to use Floyd-Warshall method
- improve read/write of GML, GEXF, GraphML
- allow string or json object as input to jit_graph
- attempt to allow numpy.array input in place of lists in more places
- faster strongly connected components
- faster Floyd-Warshall Optimization
- faster global efficiency
- faster transitive closure
- fix unionfind; betweenness_subset; lexico-topo-sort; A*;
  inverse_line_graph; async label propagation; edgelist reading;
  Gomory-Hu flow method; label_propagation; partial_duplication;
  shell_layout with 1 node in shell; from_pandas_edgelist
- Documentation improvement and fixes


API Changes
-----------

A utility function is_list_of_ints became is_bunch_of_ints
and now tests int(item)==item instead of isinstance(_, int)
This allows e.g. floats whose values are integer.

Added utility make_list_of_ints to convert containers of
integer values to lists of integers


Deprecations
------------

Removed functions (marked as deprecated in NetworkX 2.1):

- attracting_component_subgraphs
- connected_component_subgraphs
- weakly_connected_component_subgraphs
- strongly_connected_component_subgraphs
- biconnected_component_subgraphs
- See docs for component functions for how to get subgraphs.

Graph Object methods removed (marked as deprecated 2.1)

- G.add_path
- G.add_cycle
- G.add_star
- G.nodes_with_selfloops
- G.number_of_selfloops
- G.selfloop_edges
- These are now NetworkX functions, e.g. nx.add_star(G, 5)
- G.node   --> use G.nodes
- G.fresh_copy   --> use G.__class__

Remove old names for graphview functions.

- ReverseView
- SubGraph
- SubMultiGraph
- SubMultiDiGraph
- SubDiGraph
- GraphView
- DiGraphView
- MultiGraphView
- MultiDiGraphView
- MultiReverseView
- Use reverse_view, subgraph_view and generic_graph_view.

3 files changed, 128 insertions, 24 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 7fddf49c242..0ceaf5d0730 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2020/01/18 23:32:52 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2020/04/11 07:45:41 adam Exp $
 
-DISTNAME=	networkx-2.3
+DISTNAME=	networkx-2.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/networkx/}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://networkx.github.io/
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index 4e6f33d9fb4..9570e6c61bd 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/06/17 14:58:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2020/04/11 07:45:41 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -41,6 +41,9 @@ ${PYSITELIB}/networkx/algorithms/approximation/ramsey.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/steinertree.py
 ${PYSITELIB}/networkx/algorithms/approximation/steinertree.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/steinertree.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_approx_clust_coeff.py
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_approx_clust_coeff.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_approx_clust_coeff.pyo
@@ -98,6 +101,9 @@ ${PYSITELIB}/networkx/algorithms/assortativity/neighbor_degree.pyo
 ${PYSITELIB}/networkx/algorithms/assortativity/pairs.py
 ${PYSITELIB}/networkx/algorithms/assortativity/pairs.pyc
 ${PYSITELIB}/networkx/algorithms/assortativity/pairs.pyo
+${PYSITELIB}/networkx/algorithms/assortativity/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/assortativity/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/assortativity/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/assortativity/tests/base_test.py
 ${PYSITELIB}/networkx/algorithms/assortativity/tests/base_test.pyc
 ${PYSITELIB}/networkx/algorithms/assortativity/tests/base_test.pyo
@@ -116,6 +122,9 @@ ${PYSITELIB}/networkx/algorithms/assortativity/tests/test_neighbor_degree.pyo
 ${PYSITELIB}/networkx/algorithms/assortativity/tests/test_pairs.py
 ${PYSITELIB}/networkx/algorithms/assortativity/tests/test_pairs.pyc
 ${PYSITELIB}/networkx/algorithms/assortativity/tests/test_pairs.pyo
+${PYSITELIB}/networkx/algorithms/asteroidal.py
+${PYSITELIB}/networkx/algorithms/asteroidal.pyc
+${PYSITELIB}/networkx/algorithms/asteroidal.pyo
 ${PYSITELIB}/networkx/algorithms/bipartite/__init__.py
 ${PYSITELIB}/networkx/algorithms/bipartite/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/bipartite/__init__.pyo
@@ -152,6 +161,9 @@ ${PYSITELIB}/networkx/algorithms/bipartite/redundancy.pyo
 ${PYSITELIB}/networkx/algorithms/bipartite/spectral.py
 ${PYSITELIB}/networkx/algorithms/bipartite/spectral.pyc
 ${PYSITELIB}/networkx/algorithms/bipartite/spectral.pyo
+${PYSITELIB}/networkx/algorithms/bipartite/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/bipartite/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/bipartite/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/bipartite/tests/test_basic.py
 ${PYSITELIB}/networkx/algorithms/bipartite/tests/test_basic.pyc
 ${PYSITELIB}/networkx/algorithms/bipartite/tests/test_basic.pyo
@@ -224,6 +236,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.py
 ${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.pyo
+${PYSITELIB}/networkx/algorithms/centrality/group.py
+${PYSITELIB}/networkx/algorithms/centrality/group.pyc
+${PYSITELIB}/networkx/algorithms/centrality/group.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/harmonic.py
 ${PYSITELIB}/networkx/algorithms/centrality/harmonic.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/harmonic.pyo
@@ -245,6 +260,9 @@ ${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
+${PYSITELIB}/networkx/algorithms/centrality/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/__init__.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
@@ -272,6 +290,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/tests/test_dispersion.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_eigenvector_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_eigenvector_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_eigenvector_centrality.pyo
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_group.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_group.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_group.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_harmonic_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_harmonic_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_harmonic_centrality.pyo
@@ -323,6 +344,9 @@ ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring.pyo
 ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring_with_interchange.py
 ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring_with_interchange.pyc
 ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring_with_interchange.pyo
+${PYSITELIB}/networkx/algorithms/coloring/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/coloring/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/coloring/tests/__init__.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
@@ -338,9 +362,6 @@ ${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
-${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
@@ -359,15 +380,15 @@ ${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/__init__.py
+${PYSITELIB}/networkx/algorithms/community/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/community/tests/__init__.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
-${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
@@ -404,6 +425,9 @@ ${PYSITELIB}/networkx/algorithms/components/semiconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/strongly_connected.py
 ${PYSITELIB}/networkx/algorithms/components/strongly_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/strongly_connected.pyo
+${PYSITELIB}/networkx/algorithms/components/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/components/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/components/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/components/tests/test_attracting.py
 ${PYSITELIB}/networkx/algorithms/components/tests/test_attracting.pyc
 ${PYSITELIB}/networkx/algorithms/components/tests/test_attracting.pyo
@@ -419,9 +443,6 @@ ${PYSITELIB}/networkx/algorithms/components/tests/test_semiconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/tests/test_strongly_connected.py
 ${PYSITELIB}/networkx/algorithms/components/tests/test_strongly_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/tests/test_strongly_connected.pyo
-${PYSITELIB}/networkx/algorithms/components/tests/test_subgraph_copies.py
-${PYSITELIB}/networkx/algorithms/components/tests/test_subgraph_copies.pyc
-${PYSITELIB}/networkx/algorithms/components/tests/test_subgraph_copies.pyo
 ${PYSITELIB}/networkx/algorithms/components/tests/test_weakly_connected.py
 ${PYSITELIB}/networkx/algorithms/components/tests/test_weakly_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/tests/test_weakly_connected.pyo
@@ -455,6 +476,9 @@ ${PYSITELIB}/networkx/algorithms/connectivity/kcutsets.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/stoerwagner.py
 ${PYSITELIB}/networkx/algorithms/connectivity/stoerwagner.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/stoerwagner.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/connectivity/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/connectivity/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_connectivity.py
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_connectivity.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_connectivity.pyo
@@ -509,9 +533,9 @@ ${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/efficiency_measures.py
+${PYSITELIB}/networkx/algorithms/efficiency_measures.pyc
+${PYSITELIB}/networkx/algorithms/efficiency_measures.pyo
 ${PYSITELIB}/networkx/algorithms/euler.py
 ${PYSITELIB}/networkx/algorithms/euler.pyc
 ${PYSITELIB}/networkx/algorithms/euler.pyo
@@ -548,6 +572,9 @@ ${PYSITELIB}/networkx/algorithms/flow/preflowpush.pyo
 ${PYSITELIB}/networkx/algorithms/flow/shortestaugmentingpath.py
 ${PYSITELIB}/networkx/algorithms/flow/shortestaugmentingpath.pyc
 ${PYSITELIB}/networkx/algorithms/flow/shortestaugmentingpath.pyo
+${PYSITELIB}/networkx/algorithms/flow/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/flow/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/flow/tests/__init__.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
@@ -582,6 +609,9 @@ ${PYSITELIB}/networkx/algorithms/isolate.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/__init__.py
 ${PYSITELIB}/networkx/algorithms/isomorphism/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/isomorphism/__init__.pyo
+${PYSITELIB}/networkx/algorithms/isomorphism/ismags.py
+${PYSITELIB}/networkx/algorithms/isomorphism/ismags.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/ismags.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/isomorph.py
 ${PYSITELIB}/networkx/algorithms/isomorphism/isomorph.pyc
 ${PYSITELIB}/networkx/algorithms/isomorphism/isomorph.pyo
@@ -594,10 +624,16 @@ ${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/__init__.py
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/iso_r01_s80.A99
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/iso_r01_s80.B99
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/si2_b06_m200.A99
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/si2_b06_m200.B99
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_ismags.py
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_ismags.pyc
+${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_ismags.pyo
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphism.py
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphism.pyc
 ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_isomorphism.pyo
@@ -625,6 +661,9 @@ ${PYSITELIB}/networkx/algorithms/link_analysis/hits_alg.pyo
 ${PYSITELIB}/networkx/algorithms/link_analysis/pagerank_alg.py
 ${PYSITELIB}/networkx/algorithms/link_analysis/pagerank_alg.pyc
 ${PYSITELIB}/networkx/algorithms/link_analysis/pagerank_alg.pyo
+${PYSITELIB}/networkx/algorithms/link_analysis/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/link_analysis/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/link_analysis/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_hits.py
 ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_hits.pyc
 ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_hits.pyo
@@ -658,6 +697,9 @@ ${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/__init__.py
+${PYSITELIB}/networkx/algorithms/node_classification/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/node_classification/tests/__init__.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
@@ -667,6 +709,9 @@ ${PYSITELIB}/networkx/algorithms/node_classification/tests/test_local_and_global
 ${PYSITELIB}/networkx/algorithms/node_classification/utils.py
 ${PYSITELIB}/networkx/algorithms/node_classification/utils.pyc
 ${PYSITELIB}/networkx/algorithms/node_classification/utils.pyo
+${PYSITELIB}/networkx/algorithms/non_randomness.py
+${PYSITELIB}/networkx/algorithms/non_randomness.pyc
+${PYSITELIB}/networkx/algorithms/non_randomness.pyo
 ${PYSITELIB}/networkx/algorithms/operators/__init__.py
 ${PYSITELIB}/networkx/algorithms/operators/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/operators/__init__.pyo
@@ -679,6 +724,9 @@ ${PYSITELIB}/networkx/algorithms/operators/binary.pyo
 ${PYSITELIB}/networkx/algorithms/operators/product.py
 ${PYSITELIB}/networkx/algorithms/operators/product.pyc
 ${PYSITELIB}/networkx/algorithms/operators/product.pyo
+${PYSITELIB}/networkx/algorithms/operators/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/operators/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/operators/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/operators/tests/test_all.py
 ${PYSITELIB}/networkx/algorithms/operators/tests/test_all.pyc
 ${PYSITELIB}/networkx/algorithms/operators/tests/test_all.pyo
@@ -718,6 +766,9 @@ ${PYSITELIB}/networkx/algorithms/shortest_paths/dense.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/generic.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/generic.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/generic.pyo
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_astar.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_astar.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_astar.pyo
@@ -766,6 +817,9 @@ ${PYSITELIB}/networkx/algorithms/swap.pyo
 ${PYSITELIB}/networkx/algorithms/tests/__init__.py
 ${PYSITELIB}/networkx/algorithms/tests/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/tests/__init__.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_asteroidal.py
+${PYSITELIB}/networkx/algorithms/tests/test_asteroidal.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_asteroidal.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_boundary.py
 ${PYSITELIB}/networkx/algorithms/tests/test_boundary.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_boundary.pyo
@@ -850,6 +904,9 @@ ${PYSITELIB}/networkx/algorithms/tests/test_mis.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_moral.py
 ${PYSITELIB}/networkx/algorithms/tests/test_moral.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_moral.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_non_randomness.py
+${PYSITELIB}/networkx/algorithms/tests/test_non_randomness.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_non_randomness.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_planar_drawing.py
 ${PYSITELIB}/networkx/algorithms/tests/test_planar_drawing.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_planar_drawing.pyo
@@ -925,6 +982,9 @@ ${PYSITELIB}/networkx/algorithms/traversal/edgebfs.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.py
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/edgedfs.pyo
+${PYSITELIB}/networkx/algorithms/traversal/tests/__init__.py
+${PYSITELIB}/networkx/algorithms/traversal/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/traversal/tests/__init__.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
@@ -958,6 +1018,9 @@ ${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/__init__.py
+${PYSITELIB}/networkx/algorithms/tree/tests/__init__.pyc
+${PYSITELIB}/networkx/algorithms/tree/tests/__init__.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
@@ -1018,6 +1081,9 @@ ${PYSITELIB}/networkx/classes/ordered.pyo
 ${PYSITELIB}/networkx/classes/reportviews.py
 ${PYSITELIB}/networkx/classes/reportviews.pyc
 ${PYSITELIB}/networkx/classes/reportviews.pyo
+${PYSITELIB}/networkx/classes/tests/__init__.py
+${PYSITELIB}/networkx/classes/tests/__init__.pyc
+${PYSITELIB}/networkx/classes/tests/__init__.pyo
 ${PYSITELIB}/networkx/classes/tests/historical_tests.py
 ${PYSITELIB}/networkx/classes/tests/historical_tests.pyc
 ${PYSITELIB}/networkx/classes/tests/historical_tests.pyo
@@ -1084,6 +1150,9 @@ ${PYSITELIB}/networkx/drawing/nx_pydot.pyo
 ${PYSITELIB}/networkx/drawing/nx_pylab.py
 ${PYSITELIB}/networkx/drawing/nx_pylab.pyc
 ${PYSITELIB}/networkx/drawing/nx_pylab.pyo
+${PYSITELIB}/networkx/drawing/tests/__init__.py
+${PYSITELIB}/networkx/drawing/tests/__init__.pyc
+${PYSITELIB}/networkx/drawing/tests/__init__.pyo
 ${PYSITELIB}/networkx/drawing/tests/test_agraph.py
 ${PYSITELIB}/networkx/drawing/tests/test_agraph.pyc
 ${PYSITELIB}/networkx/drawing/tests/test_agraph.pyo
@@ -1109,6 +1178,9 @@ ${PYSITELIB}/networkx/generators/atlas.pyo
 ${PYSITELIB}/networkx/generators/classic.py
 ${PYSITELIB}/networkx/generators/classic.pyc
 ${PYSITELIB}/networkx/generators/classic.pyo
+${PYSITELIB}/networkx/generators/cographs.py
+${PYSITELIB}/networkx/generators/cographs.pyc
+${PYSITELIB}/networkx/generators/cographs.pyo
 ${PYSITELIB}/networkx/generators/community.py
 ${PYSITELIB}/networkx/generators/community.pyc
 ${PYSITELIB}/networkx/generators/community.pyo
@@ -1133,6 +1205,9 @@ ${PYSITELIB}/networkx/generators/geometric.pyo
 ${PYSITELIB}/networkx/generators/harary_graph.py
 ${PYSITELIB}/networkx/generators/harary_graph.pyc
 ${PYSITELIB}/networkx/generators/harary_graph.pyo
+${PYSITELIB}/networkx/generators/internet_as_graphs.py
+${PYSITELIB}/networkx/generators/internet_as_graphs.pyc
+${PYSITELIB}/networkx/generators/internet_as_graphs.pyo
 ${PYSITELIB}/networkx/generators/intersection.py
 ${PYSITELIB}/networkx/generators/intersection.pyc
 ${PYSITELIB}/networkx/generators/intersection.pyo
@@ -1169,12 +1244,18 @@ ${PYSITELIB}/networkx/generators/spectral_graph_forge.pyo
 ${PYSITELIB}/networkx/generators/stochastic.py
 ${PYSITELIB}/networkx/generators/stochastic.pyc
 ${PYSITELIB}/networkx/generators/stochastic.pyo
+${PYSITELIB}/networkx/generators/tests/__init__.py
+${PYSITELIB}/networkx/generators/tests/__init__.pyc
+${PYSITELIB}/networkx/generators/tests/__init__.pyo
 ${PYSITELIB}/networkx/generators/tests/test_atlas.py
 ${PYSITELIB}/networkx/generators/tests/test_atlas.pyc
 ${PYSITELIB}/networkx/generators/tests/test_atlas.pyo
 ${PYSITELIB}/networkx/generators/tests/test_classic.py
 ${PYSITELIB}/networkx/generators/tests/test_classic.pyc
 ${PYSITELIB}/networkx/generators/tests/test_classic.pyo
+${PYSITELIB}/networkx/generators/tests/test_cographs.py
+${PYSITELIB}/networkx/generators/tests/test_cographs.pyc
+${PYSITELIB}/networkx/generators/tests/test_cographs.pyo
 ${PYSITELIB}/networkx/generators/tests/test_community.py
 ${PYSITELIB}/networkx/generators/tests/test_community.pyc
 ${PYSITELIB}/networkx/generators/tests/test_community.pyo
@@ -1199,6 +1280,9 @@ ${PYSITELIB}/networkx/generators/tests/test_geometric.pyo
 ${PYSITELIB}/networkx/generators/tests/test_harary_graph.py
 ${PYSITELIB}/networkx/generators/tests/test_harary_graph.pyc
 ${PYSITELIB}/networkx/generators/tests/test_harary_graph.pyo
+${PYSITELIB}/networkx/generators/tests/test_internet_as_graphs.py
+${PYSITELIB}/networkx/generators/tests/test_internet_as_graphs.pyc
+${PYSITELIB}/networkx/generators/tests/test_internet_as_graphs.pyo
 ${PYSITELIB}/networkx/generators/tests/test_intersection.py
 ${PYSITELIB}/networkx/generators/tests/test_intersection.pyc
 ${PYSITELIB}/networkx/generators/tests/test_intersection.pyo
@@ -1253,6 +1337,9 @@ ${PYSITELIB}/networkx/linalg/algebraicconnectivity.pyo
 ${PYSITELIB}/networkx/linalg/attrmatrix.py
 ${PYSITELIB}/networkx/linalg/attrmatrix.pyc
 ${PYSITELIB}/networkx/linalg/attrmatrix.pyo
+${PYSITELIB}/networkx/linalg/bethehessianmatrix.py
+${PYSITELIB}/networkx/linalg/bethehessianmatrix.pyc
+${PYSITELIB}/networkx/linalg/bethehessianmatrix.pyo
 ${PYSITELIB}/networkx/linalg/graphmatrix.py
 ${PYSITELIB}/networkx/linalg/graphmatrix.pyc
 ${PYSITELIB}/networkx/linalg/graphmatrix.pyo
@@ -1265,9 +1352,15 @@ ${PYSITELIB}/networkx/linalg/modularitymatrix.pyo
 ${PYSITELIB}/networkx/linalg/spectrum.py
 ${PYSITELIB}/networkx/linalg/spectrum.pyc
 ${PYSITELIB}/networkx/linalg/spectrum.pyo
+${PYSITELIB}/networkx/linalg/tests/__init__.py
+${PYSITELIB}/networkx/linalg/tests/__init__.pyc
+${PYSITELIB}/networkx/linalg/tests/__init__.pyo
 ${PYSITELIB}/networkx/linalg/tests/test_algebraic_connectivity.py
 ${PYSITELIB}/networkx/linalg/tests/test_algebraic_connectivity.pyc
 ${PYSITELIB}/networkx/linalg/tests/test_algebraic_connectivity.pyo
+${PYSITELIB}/networkx/linalg/tests/test_bethehessian.py
+${PYSITELIB}/networkx/linalg/tests/test_bethehessian.pyc
+${PYSITELIB}/networkx/linalg/tests/test_bethehessian.pyo
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.py
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyc
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyo
@@ -1319,6 +1412,9 @@ ${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/__init__.py
+${PYSITELIB}/networkx/readwrite/json_graph/tests/__init__.pyc
+${PYSITELIB}/networkx/readwrite/json_graph/tests/__init__.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
@@ -1358,6 +1454,9 @@ ${PYSITELIB}/networkx/readwrite/pajek.pyo
 ${PYSITELIB}/networkx/readwrite/sparse6.py
 ${PYSITELIB}/networkx/readwrite/sparse6.pyc
 ${PYSITELIB}/networkx/readwrite/sparse6.pyo
+${PYSITELIB}/networkx/readwrite/tests/__init__.py
+${PYSITELIB}/networkx/readwrite/tests/__init__.pyc
+${PYSITELIB}/networkx/readwrite/tests/__init__.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_adjlist.py
 ${PYSITELIB}/networkx/readwrite/tests/test_adjlist.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_adjlist.pyo
@@ -1406,6 +1505,12 @@ ${PYSITELIB}/networkx/release.pyo
 ${PYSITELIB}/networkx/testing/__init__.py
 ${PYSITELIB}/networkx/testing/__init__.pyc
 ${PYSITELIB}/networkx/testing/__init__.pyo
+${PYSITELIB}/networkx/testing/test.py
+${PYSITELIB}/networkx/testing/test.pyc
+${PYSITELIB}/networkx/testing/test.pyo
+${PYSITELIB}/networkx/testing/tests/__init__.py
+${PYSITELIB}/networkx/testing/tests/__init__.pyc
+${PYSITELIB}/networkx/testing/tests/__init__.pyo
 ${PYSITELIB}/networkx/testing/tests/test_utils.py
 ${PYSITELIB}/networkx/testing/tests/test_utils.pyc
 ${PYSITELIB}/networkx/testing/tests/test_utils.pyo
@@ -1415,9 +1520,6 @@ ${PYSITELIB}/networkx/testing/utils.pyo
 ${PYSITELIB}/networkx/tests/__init__.py
 ${PYSITELIB}/networkx/tests/__init__.pyc
 ${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
@@ -1463,6 +1565,9 @@ ${PYSITELIB}/networkx/utils/random_sequence.pyo
 ${PYSITELIB}/networkx/utils/rcm.py
 ${PYSITELIB}/networkx/utils/rcm.pyc
 ${PYSITELIB}/networkx/utils/rcm.pyo
+${PYSITELIB}/networkx/utils/tests/__init__.py
+${PYSITELIB}/networkx/utils/tests/__init__.pyc
+${PYSITELIB}/networkx/utils/tests/__init__.pyo
 ${PYSITELIB}/networkx/utils/tests/test_contextmanager.py
 ${PYSITELIB}/networkx/utils/tests/test_contextmanager.pyc
 ${PYSITELIB}/networkx/utils/tests/test_contextmanager.pyo
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 8577e81935f..435b1abccad 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2019/09/25 07:24:12 adam Exp $
+$NetBSD: distinfo,v 1.15 2020/04/11 07:45:41 adam Exp $
 
-SHA1 (networkx-2.3.zip) = 04339840fc9ed9018f17efa58f9a5d9a59cd523d
-RMD160 (networkx-2.3.zip) = 5263d628b5e7e4407234575b68f06d9632e26b79
-SHA512 (networkx-2.3.zip) = 38e8abf247284bc006234f7d9bb7faf6b7ad539f7bf9d6f3274ec7e11c624f8cbf53bf629487764f828fa0598ccf2ab18fc6c3bbbbf1a0332e6a5dabe7135cf7
-Size (networkx-2.3.zip) = 1743914 bytes
+SHA1 (networkx-2.4.tar.gz) = ffed34d57b2a758e30c02d2730bf0eefef5ed0a8
+RMD160 (networkx-2.4.tar.gz) = dd24447411f7a8ec05bcad713255109a9ead3dfd
+SHA512 (networkx-2.4.tar.gz) = 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
+Size (networkx-2.4.tar.gz) = 1462338 bytes
 SHA1 (patch-setup.py) = 9859c3102492d4f9afd41533c3b1bf45cbc6850d