[pkgsrc/trunk]: pkgsrc/math/py-networkx py-networkx: update to 2.0

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2a8a0ecc164
branches:  trunk
changeset: 369151:c2a8a0ecc164
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Sep 27 13:25:54 2017 +0000

description:
py-networkx: update to 2.0

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

diffstat:

 math/py-networkx/Makefile |   47 ++--
 math/py-networkx/PLIST    |  395 +++++++++++++++++++++++++++++++++++----------
 math/py-networkx/distinfo |   10 +-
 3 files changed, 335 insertions(+), 117 deletions(-)

diffs (truncated from 858 to 300 lines):

diff -r 5c43c9da4b4e -r c2a8a0ecc164 math/py-networkx/Makefile
--- a/math/py-networkx/Makefile Wed Sep 27 13:25:53 2017 +0000
+++ b/math/py-networkx/Makefile Wed Sep 27 13:25:54 2017 +0000
@@ -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@localhost
 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 -r 5c43c9da4b4e -r c2a8a0ecc164 math/py-networkx/PLIST
--- a/math/py-networkx/PLIST    Wed Sep 27 13:25:53 2017 +0000
+++ b/math/py-networkx/PLIST    Wed Sep 27 13:25:54 2017 +0000
@@ -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/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_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_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/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/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_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_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/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/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_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/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/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/tests/gl1.gpickle.bz2