Update to 1.7

Release Log
Networkx-1.7
Release date: 4 July 2012

Highlights
New functions for k-clique community finding, flow hierarchy, union, disjoint union, compose, and intersection operators that work on lists of graphs, and creating the biadjacency matrix of a bipartite graph.
New approximation algorithms for dominating set, edge dominating set, independent set, max clique, and min-weighted vertex cover.
Many bug fixes and other improvements.
For full details of the tickets closed for this release (added features and bug fixes) see: https://networkx.lanl.gov/trac/query?status=closed&group=milestone&milestone=networkx-1.7

API Changes
See Version 1.7 notes and API changes

3 files changed, 97 insertions, 19 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 069c6b2ff80..f0d8205b9dc 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/06/02 13:19:17 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/07/13 14:00:32 wen Exp $
 #
 
-DISTNAME=	networkx-1.6
+DISTNAME=	networkx-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	http://pypi.python.org/packages/source/n/networkx/ \
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index 8a9eca9647c..eefef7234b4 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/06/02 13:19:17 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/07/13 14:00:32 wen Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/networkx/__init__.py
 ${PYSITELIB}/networkx/__init__.pyc
@@ -6,6 +6,45 @@ ${PYSITELIB}/networkx/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/__init__.py
 ${PYSITELIB}/networkx/algorithms/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/__init__.pyo
+${PYSITELIB}/networkx/algorithms/approximation/__init__.py
+${PYSITELIB}/networkx/algorithms/approximation/__init__.pyc
+${PYSITELIB}/networkx/algorithms/approximation/__init__.pyo
+${PYSITELIB}/networkx/algorithms/approximation/clique.py
+${PYSITELIB}/networkx/algorithms/approximation/clique.pyc
+${PYSITELIB}/networkx/algorithms/approximation/clique.pyo
+${PYSITELIB}/networkx/algorithms/approximation/dominating_set.py
+${PYSITELIB}/networkx/algorithms/approximation/dominating_set.pyc
+${PYSITELIB}/networkx/algorithms/approximation/dominating_set.pyo
+${PYSITELIB}/networkx/algorithms/approximation/independent_set.py
+${PYSITELIB}/networkx/algorithms/approximation/independent_set.pyc
+${PYSITELIB}/networkx/algorithms/approximation/independent_set.pyo
+${PYSITELIB}/networkx/algorithms/approximation/matching.py
+${PYSITELIB}/networkx/algorithms/approximation/matching.pyc
+${PYSITELIB}/networkx/algorithms/approximation/matching.pyo
+${PYSITELIB}/networkx/algorithms/approximation/ramsey.py
+${PYSITELIB}/networkx/algorithms/approximation/ramsey.pyc
+${PYSITELIB}/networkx/algorithms/approximation/ramsey.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_clique.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_clique.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_clique.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_dominating_set.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_dominating_set.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_dominating_set.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_independent_set.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_independent_set.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_independent_set.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_matching.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_matching.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_matching.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_ramsey.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_ramsey.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_ramsey.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/vertex_cover.py
+${PYSITELIB}/networkx/algorithms/approximation/vertex_cover.pyc
+${PYSITELIB}/networkx/algorithms/approximation/vertex_cover.pyo
 ${PYSITELIB}/networkx/algorithms/assortativity/__init__.py
 ${PYSITELIB}/networkx/algorithms/assortativity/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/assortativity/__init__.pyo
@@ -246,6 +285,9 @@ ${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.pyo
 ${PYSITELIB}/networkx/algorithms/graphical.py
 ${PYSITELIB}/networkx/algorithms/graphical.pyc
 ${PYSITELIB}/networkx/algorithms/graphical.pyo
+${PYSITELIB}/networkx/algorithms/hierarchy.py
+${PYSITELIB}/networkx/algorithms/hierarchy.pyc
+${PYSITELIB}/networkx/algorithms/hierarchy.pyo
 ${PYSITELIB}/networkx/algorithms/isolate.py
 ${PYSITELIB}/networkx/algorithms/isolate.pyc
 ${PYSITELIB}/networkx/algorithms/isolate.pyo
@@ -301,12 +343,33 @@ ${PYSITELIB}/networkx/algorithms/mis.pyo
 ${PYSITELIB}/networkx/algorithms/mst.py
 ${PYSITELIB}/networkx/algorithms/mst.pyc
 ${PYSITELIB}/networkx/algorithms/mst.pyo
-${PYSITELIB}/networkx/algorithms/operators.py
-${PYSITELIB}/networkx/algorithms/operators.pyc
-${PYSITELIB}/networkx/algorithms/operators.pyo
-${PYSITELIB}/networkx/algorithms/product.py
-${PYSITELIB}/networkx/algorithms/product.pyc
-${PYSITELIB}/networkx/algorithms/product.pyo
+${PYSITELIB}/networkx/algorithms/operators/__init__.py
+${PYSITELIB}/networkx/algorithms/operators/__init__.pyc
+${PYSITELIB}/networkx/algorithms/operators/__init__.pyo
+${PYSITELIB}/networkx/algorithms/operators/all.py
+${PYSITELIB}/networkx/algorithms/operators/all.pyc
+${PYSITELIB}/networkx/algorithms/operators/all.pyo
+${PYSITELIB}/networkx/algorithms/operators/binary.py
+${PYSITELIB}/networkx/algorithms/operators/binary.pyc
+${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/test_all.py
+${PYSITELIB}/networkx/algorithms/operators/tests/test_all.pyc
+${PYSITELIB}/networkx/algorithms/operators/tests/test_all.pyo
+${PYSITELIB}/networkx/algorithms/operators/tests/test_binary.py
+${PYSITELIB}/networkx/algorithms/operators/tests/test_binary.pyc
+${PYSITELIB}/networkx/algorithms/operators/tests/test_binary.pyo
+${PYSITELIB}/networkx/algorithms/operators/tests/test_product.py
+${PYSITELIB}/networkx/algorithms/operators/tests/test_product.pyc
+${PYSITELIB}/networkx/algorithms/operators/tests/test_product.pyo
+${PYSITELIB}/networkx/algorithms/operators/tests/test_unary.py
+${PYSITELIB}/networkx/algorithms/operators/tests/test_unary.pyc
+${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/richclub.py
 ${PYSITELIB}/networkx/algorithms/richclub.pyc
 ${PYSITELIB}/networkx/algorithms/richclub.pyo
@@ -328,6 +391,9 @@ ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_astar.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense.pyo
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense_numpy.py
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense_numpy.pyc
+${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_dense_numpy.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_generic.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_generic.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/tests/test_generic.pyo
@@ -343,6 +409,9 @@ ${PYSITELIB}/networkx/algorithms/shortest_paths/unweighted.pyo
 ${PYSITELIB}/networkx/algorithms/shortest_paths/weighted.py
 ${PYSITELIB}/networkx/algorithms/shortest_paths/weighted.pyc
 ${PYSITELIB}/networkx/algorithms/shortest_paths/weighted.pyo
+${PYSITELIB}/networkx/algorithms/simple_paths.py
+${PYSITELIB}/networkx/algorithms/simple_paths.pyc
+${PYSITELIB}/networkx/algorithms/simple_paths.pyo
 ${PYSITELIB}/networkx/algorithms/smetric.py
 ${PYSITELIB}/networkx/algorithms/smetric.pyc
 ${PYSITELIB}/networkx/algorithms/smetric.pyo
@@ -382,6 +451,9 @@ ${PYSITELIB}/networkx/algorithms/tests/test_euler.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_graphical.py
 ${PYSITELIB}/networkx/algorithms/tests/test_graphical.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_graphical.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_hierarchy.py
+${PYSITELIB}/networkx/algorithms/tests/test_hierarchy.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_hierarchy.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.py
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.pyo
@@ -391,15 +463,12 @@ ${PYSITELIB}/networkx/algorithms/tests/test_mis.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_mst.py
 ${PYSITELIB}/networkx/algorithms/tests/test_mst.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_mst.pyo
-${PYSITELIB}/networkx/algorithms/tests/test_operators.py
-${PYSITELIB}/networkx/algorithms/tests/test_operators.pyc
-${PYSITELIB}/networkx/algorithms/tests/test_operators.pyo
-${PYSITELIB}/networkx/algorithms/tests/test_product.py
-${PYSITELIB}/networkx/algorithms/tests/test_product.pyc
-${PYSITELIB}/networkx/algorithms/tests/test_product.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_richclub.py
 ${PYSITELIB}/networkx/algorithms/tests/test_richclub.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_richclub.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_smetric.py
 ${PYSITELIB}/networkx/algorithms/tests/test_smetric.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_smetric.pyo
@@ -745,6 +814,15 @@ ${PYSITELIB}/networkx/relabel.pyo
 ${PYSITELIB}/networkx/release.py
 ${PYSITELIB}/networkx/release.pyc
 ${PYSITELIB}/networkx/release.pyo
+${PYSITELIB}/networkx/testing/__init__.py
+${PYSITELIB}/networkx/testing/__init__.pyc
+${PYSITELIB}/networkx/testing/__init__.pyo
+${PYSITELIB}/networkx/testing/tests/test_utils.py
+${PYSITELIB}/networkx/testing/tests/test_utils.pyc
+${PYSITELIB}/networkx/testing/tests/test_utils.pyo
+${PYSITELIB}/networkx/testing/utils.py
+${PYSITELIB}/networkx/testing/utils.pyc
+${PYSITELIB}/networkx/testing/utils.pyo
 ${PYSITELIB}/networkx/tests/__init__.py
 ${PYSITELIB}/networkx/tests/__init__.pyc
 ${PYSITELIB}/networkx/tests/__init__.pyo
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 57d06959872..921798e2b8a 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/02 13:19:17 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/07/13 14:00:32 wen Exp $
 
-SHA1 (networkx-1.6.tar.gz) = cf43e0033e2499f77afb21eb4ecce1a94e4a8273
-RMD160 (networkx-1.6.tar.gz) = 95066c89565645bade07e520021d0249ce0955d8
-Size (networkx-1.6.tar.gz) = 707795 bytes
+SHA1 (networkx-1.7.tar.gz) = 1a83dbbac6fb4abc6bfd644ae3c4a6af8ebb1c33
+RMD160 (networkx-1.7.tar.gz) = 90c35abf42a0ec68b3ece14cac02f4b47b6c0a20
+Size (networkx-1.7.tar.gz) = 728145 bytes