From 88bb1bea573a58155099e7138c2ce05af5241fd667322f629c8713c5b4f035a4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 17 Sep 2014 15:26:53 +0000 Subject: [PATCH] Accepting request 249853 from devel:languages:python 1 OBS-URL: https://build.opensuse.org/request/show/249853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-networkx?expand=0&rev=3 --- networkx-1.8.1.tar.gz | 3 --- networkx-1.9.tar.gz | 3 +++ python-networkx.changes | 42 +++++++++++++++++++++++++++++++++++++++++ python-networkx.spec | 10 ++++++---- 4 files changed, 51 insertions(+), 7 deletions(-) delete mode 100644 networkx-1.8.1.tar.gz create mode 100644 networkx-1.9.tar.gz diff --git a/networkx-1.8.1.tar.gz b/networkx-1.8.1.tar.gz deleted file mode 100644 index eaf30b6..0000000 --- a/networkx-1.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b75ba675fd2831f60e3f5a028822a8f7b9993877854599e9694196f8b2f88233 -size 806766 diff --git a/networkx-1.9.tar.gz b/networkx-1.9.tar.gz new file mode 100644 index 0000000..d8b74b1 --- /dev/null +++ b/networkx-1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52e8eea77b0d3f5420cadaca55181c862f06a79a4500f06917b58a0455a12b22 +size 1035166 diff --git a/python-networkx.changes b/python-networkx.changes index 5d5b89a..f0d580c 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Mon Sep 15 14:49:41 UTC 2014 - tbechtold@suse.com + +- update to version 1.9: + * The flow package (networkx.algorithms.flow) is completely rewritten + with backward incompatible changes. It introduces a new interface + to flow algorithms. Existing code that uses the flow package will + not work unmodified with NetworkX 1.9. + * We added two new maximum flow algorithms (preflow_push and + shortest_augmenting_path) and rewrote All maximum flow algorithm + implementations (including the legacy ford_fulkerson) output now + a residual network (i.e., a DiGraph) after computing the maximum + flow. See maximum_flow documentation for the details on the + conventions that NetworkX uses for defining a residual network. + * We removed the old max_flow and min_cut functions. The main entry + points to flow algorithms are now the functions maximum_flow, + maximum_flow_value, minimum_cut and minimum_cut_value, which have + new parameters that control maximum flow computation: flow_func + for specifying the algorithm that will do the actual computation + (it accepts a function as argument that implements a maximum flow + algorithm), cutoff for suggesting a maximum flow value at which the + algorithm stops, value_only for stopping the computation as soon as + we have the value of the flow, and residual that accepts as argument + a residual network to be reused in repeated maximum flow computation. + * All flow algorithms are required to accept arguments for these parameters + but may selectively ignored the inapplicable ones. For instance, + preflow_push algorithm can stop after the preflow phase without computing + a maximum flow if we only need the flow value, but both edmonds_karp and + shortest_augmenting_path always compute a maximum flow to obtain the + low value. + * The new function minimum_cut returns the cut value and a node partition + that defines the minimum cut. The function minimum_cut_value returns + only the value of the cut, which is what the removed min_cut function + used to return before 1.9. + * The functions that implement flow algorithms (i.e., preflow_push, + edmonds_karp, shortest_augmenting_path and ford_fulkerson) are not + imported to the base NetworkX namespace. You have to explicitly import + them from the flow package. + * We also added a capacity-scaling minimum cost flow algorithm: capacity + scaling. It supports MultiDiGraph and disconnected networks. +- Add python-decorator as Requires + ------------------------------------------------------------------- Mon Dec 9 13:26:37 UTC 2013 - toddrme2178@gmail.com diff --git a/python-networkx.spec b/python-networkx.spec index 096a2a8..fd55882 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -1,7 +1,7 @@ # # spec file for package python-networkx # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: python-networkx -Version: 1.8.1 +Version: 1.9 Release: 0 -License: BSD-3-Clause Summary: Python package for the creation, manipulation, -Url: http://networkx.lanl.gov +License: BSD-3-Clause Group: Development/Languages/Python +Url: http://networkx.lanl.gov Source: http://pypi.python.org/packages/source/n/networkx/networkx-%{version}.tar.gz BuildRequires: fdupes BuildRequires: python-PyYAML @@ -33,6 +33,8 @@ BuildRequires: python-pydot BuildRequires: python-pygraphviz BuildRequires: python-pyparsing BuildRequires: python-scipy +BuildRequires: python-setuptools +Requires: python-decorator >= 3.4.0 Recommends: python-matplotlib Recommends: python-numpy Recommends: python-pydot