23207040 Upgrade networkx to 1.11
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:31 -0700
changeset 6796 a5a8a214aa90
parent 6795 832c5da5f7f1
child 6797 a7ac1d3c2e2e
23207040 Upgrade networkx to 1.11
components/python/networkx/Makefile
components/python/networkx/networkx-GENFRAG.p5m
components/python/networkx/networkx-PYVER.p5m
--- a/components/python/networkx/Makefile	Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/networkx/Makefile	Wed Sep 07 14:48:31 2016 -0700
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		networkx
-COMPONENT_VERSION=	1.9.1
+COMPONENT_VERSION=	1.11
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59
+    sha256:0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://networkx.github.io/
 COMPONENT_BUGDB=	python-mod/networkx
 
-TPNO=			21625
+TPNO=			28004
 
 # Depends on python-extra (numpy) which is not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
@@ -59,4 +59,4 @@
 
 test:		$(TEST_NO_ARCH)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
--- a/components/python/networkx/networkx-GENFRAG.p5m	Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/networkx/networkx-GENFRAG.p5m	Wed Sep 07 14:48:31 2016 -0700
@@ -20,14 +20,13 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # we have to reverse the autopyc transform for stuff in /usr/share/doc
 # since there are only py files there
 <transform file path=usr/share/doc/.+\.pyc$ -> drop>
 #
-file path=usr/share/doc/networkx-$(COMPONENT_VERSION)/README.txt
 file path=usr/share/doc/networkx-$(COMPONENT_VERSION)/examples/3d_drawing/mayavi2_spring.py
 file path=usr/share/doc/networkx-$(COMPONENT_VERSION)/examples/advanced/eigenvalues.py
 file path=usr/share/doc/networkx-$(COMPONENT_VERSION)/examples/advanced/heavy_metal_umlaut.py
--- a/components/python/networkx/networkx-PYVER.p5m	Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/networkx/networkx-PYVER.p5m	Wed Sep 07 14:48:31 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -50,8 +50,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/clique.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/clustering_coefficient.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/connectivity.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/dominating_set.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/independent_set.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/kcomponents.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/matching.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/ramsey.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/approximation/vertex_cover.py
@@ -65,6 +67,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/basic.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/centrality.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/cluster.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/edgelist.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/generators.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/matching.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/matrix.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/projection.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/redundancy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/bipartite/spectral.py
@@ -82,12 +88,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/centrality/dispersion.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/centrality/eigenvector.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/centrality/flow_matrix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/centrality/harmonic.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/centrality/katz.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/centrality/load.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/chordal/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/chordal/chordal_alg.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/clique.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/cluster.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/coloring/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/coloring/greedy_coloring.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/coloring/greedy_coloring_with_interchange.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/community/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/community/kclique.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/components/__init__.py
@@ -100,6 +110,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/connectivity/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/connectivity/connectivity.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/connectivity/cuts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/connectivity/kcomponents.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/connectivity/kcutsets.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/connectivity/stoerwagner.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/connectivity/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/core.py
@@ -107,12 +119,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/dag.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/distance_measures.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/distance_regular.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/dominance.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/dominating.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/euler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/capacityscaling.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/edmondskarp.py
-file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/fordfulkerson.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/maxflow.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/mincost.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/networksimplex.py
@@ -121,6 +133,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/flow/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/graphical.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/hierarchy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/hybrid.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/isolate.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/isomorphism/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/isomorphism/isomorph.py
@@ -132,6 +145,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/link_analysis/pagerank_alg.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/link_prediction.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/matching.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/minors.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/mis.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/mst.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/operators/__init__.py
@@ -152,8 +166,11 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/traversal/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/traversal/breadth_first_search.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/traversal/depth_first_search.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/traversal/edgedfs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/tree/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/tree/branchings.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/tree/recognition.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/triads.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/algorithms/vitality.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/classes/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/classes/digraph.py
@@ -161,6 +178,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/classes/graph.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/classes/multidigraph.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/classes/multigraph.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/classes/ordered.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/convert.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/convert_matrix.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/drawing/__init__.py
@@ -172,16 +190,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/external/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/atlas.py
-file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/bipartite.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/classic.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/community.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/degree_seq.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/directed.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/ego.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/expanders.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/geometric.py
-file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/hybrid.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/intersection.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/line.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/nonisomorphic_trees.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/random_clustered.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/random_graphs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/generators/small.py
@@ -193,6 +211,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/linalg/attrmatrix.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/linalg/graphmatrix.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/linalg/laplacianmatrix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/networkx/linalg/modularitymatrix.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/linalg/spectrum.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/readwrite/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/networkx/readwrite/adjlist.py
@@ -227,10 +246,6 @@
 #
 license LICENSE.txt license=BSD
 
-# force a group dependency on the optional pyyaml; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/pyyaml-$(PYV)
-
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
@@ -242,9 +257,5 @@
 depend type=require \
     fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
-# force a dependency on pyparsing; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pyparsing-$(PYV)
-
-# force a dependency on python-extra; pkgdepend work is needed to flush this
-# out.
-$(PYTHON_2.7_ONLY)depend type=require fmri=library/python/python-extra-$(PYV)
+# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyyaml-$(PYV)