Hello community, here is the log from the commit of package python-networkx for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/python-networkx (Old) and /work/SRC/openSUSE:Leap:15.2/.python-networkx.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-networkx" Fri May 29 18:49:10 2020 rev:12 rq:810201 version:2.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/python-networkx/python-networkx.changes 2020-01-15 15:50:47.015506432 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.python-networkx.new.3606/python-networkx.changes 2020-05-29 18:49:11.264204496 +0200 @@ -1,0 +2,94 @@ +Fri Nov 22 00:41:03 UTC 2019 - steven.kowalik@suse.com + +- Drop incorrectly calculated dependency on python33 +- Switch to using %pytest macro + +------------------------------------------------------------------- +Sun Nov 17 23:53:12 UTC 2019 - Steve Kowalik <steven.kowalik@suse.com> + +- Update to version 2.4 + Highlights: + * Remove deprecated code from 1.x + * Support for Python 3.8 + * Switched to pytest for testing + * Last release to support Python 3.5 + * Fifteen new fuctions, including onion decomposition and linear prufing + * Three new generators, such as a directed joint degree generator +- Add numpy-38-test.patch, to correct test failure under Python 3.8 +- Update URL, upstream changed to tarballs from zipfiles. + +------------------------------------------------------------------- +Tue Jul 23 17:28:58 UTC 2019 - Todd R <toddrme2178@gmail.com> + +- Update to version 2.3 + Highlights: + * Dropped support for Python 2. We are no longer supporting Python 2.7 and we will + start changing code to take advantage of Python 3 features we couldn't before. + * Added some Moral Graph analysis functions. + * Enable matplotlib drawing using curved arrows via connectionstyle parameter. + * Remove ticks and axes labels from matplotlib plots. + * Two new generators of Harary Graphs. + * Added Dual Barabasi-Albert model + * Added VoteRank algorithm + * Added Equitable coloring algorithms + * Added planar layout algorithms + * Les Miserables network example + * Javascript example update + +------------------------------------------------------------------- +Tue Jan 22 11:33:30 UTC 2019 - Matej Cepl <mcepl@suse.com> + +- Switch off test_subgraph_centrality_big_graph test, as it leads to + crashes on i586, gh#networkx/networkx#3304. + +------------------------------------------------------------------- +Fri Jan 4 14:41:26 UTC 2019 - Jan Engelhardt <jengelh@inai.de> + +- Fix incomplete summary. Trim filler wording from description. + +------------------------------------------------------------------- +Wed Jan 2 13:55:25 UTC 2019 - Martin Pluskal <mpluskal@suse.com> + +- Update to version 2.2: + * Add support for Python 3.7. This is the last release to support + Python 2. + * Uniform random number generator (RNG) handling which defaults + to global RNGs but allows specification of a single RNG for all + random numbers in NX. + * Improved GraphViews to ease subclassing and remove cyclic + references which caused trouble with deepcopy and pickle. + * New Graph method G.update(H) +- Run tests +- Update project url + +------------------------------------------------------------------- +Sun Sep 2 17:28:03 UTC 2018 - arun@gmx.de + +- specfile: + * update copyright year + * removed devel from noarch package + +- update to version 2.1: + * Highlights + + Arrows for drawing DiGraph edges are vastly improved! And an + example to show them. + + More than 12 new functions for graph generation, manipulation + and/or new graph algorithms. + o Add a large clique size heuristic function (#2830) + o Add rooted product function (#2825) + o Label Propagation Community Detection (#2821) + o Minimum cycle basis (#2823) + o Add Mycielski Operator (#2785) + o Adds prefix_tree, dag_to_branching, and example. (#2784) + o Add inverse_line_graph generator from #2241 (#2782) + o Steiner tree and metric closure. (#2252) + o Add flow based node and edge disjoint paths. (#2063) + o Update geometric networks with new models (#2498) + o Graph edit distance (#2729) + o Added function for finding a k-edge-augmentation (#2572) + + G.name is no longer processed by graph operators. It remains as + a property mechanism to access G.graph['name'] but the user is + in charge of updating or changing it for copies, subgraphs, + unions and other graph operations. + +------------------------------------------------------------------- Old: ---- networkx-2.0.zip New: ---- networkx-2.4.tar.gz numpy-38-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-networkx.spec ++++++ --- /var/tmp/diff_new_pack.LdcPXg/_old 2020-05-29 18:49:11.608205483 +0200 +++ /var/tmp/diff_new_pack.LdcPXg/_new 2020-05-29 18:49:11.612205495 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-networkx # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,40 +12,40 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-networkx -Version: 2.0 +Version: 2.4 Release: 0 -Summary: Python package for the creation, manipulation, +Summary: Python package for the study of complex networks License: BSD-3-Clause Group: Development/Languages/Python -Url: http://networkx.lanl.gov -Source: https://files.pythonhosted.org/packages/source/n/networkx/networkx-%{version}.zip +URL: https://networkx.github.io/ +Source: https://files.pythonhosted.org/packages/source/n/networkx/networkx-%{version}.tar.gz +# UPSTREAM PATCH: gh#networkx/networkx#3724 +Patch0: numpy-38-test.patch BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module decorator >= 3.4.0} -BuildRequires: %{python_module devel} BuildRequires: %{python_module matplotlib} -BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module pydot} BuildRequires: %{python_module pyparsing} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module scipy} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip Requires: python-decorator >= 3.4.0 +Recommends: python-PyYAML +Recommends: python-matplotlib Recommends: python-pydot Recommends: python-pygraphviz -Recommends: python-PyYAML Recommends: python-pyparsing -Recommends: python-numpy -Recommends: python-matplotlib Recommends: python-scipy -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -55,11 +55,10 @@ Features: * Includes standard graph-theoretic and statistical physics functions - * Easy exchange of network algorithms between applications, disciplines, and platforms + * Exchange of network algorithms between applications, disciplines, and platforms * Includes many classic graphs and synthetic networks * Nodes and edges can be "anything" (e.g. time-series, text, images, XML records) * Exploits existing code from high-quality legacy software in C, C++, Fortran, etc. - * Open source (encourages community input) * Unit-tested %package -n %{name}-doc @@ -70,9 +69,9 @@ %description -n %{name}-doc Documentation and examples for %{name}. - %prep %setup -q -n networkx-%{version} +%autopatch -p1 %build %python_build @@ -90,8 +89,9 @@ %{python_expand pushd %{buildroot}%{$python_sitelib} # Fix wrong-script-interpreter -find networkx -name '*test*.py' -exec sed -i "s|#!/usr/bin/env python|#!%__$python|" {} \; -find networkx -name '*test*.py' -exec grep -q '#!%__$python' {} \; -exec chmod a+x {} \; +find networkx -name '*test*.py' -exec sed -i "s|#!%{_bindir}/env python$|#!%__$python|" {} + +find networkx -name '*test*.py' -exec sed -i "s|#!%{_bindir}/env python3$|#!%__$python|" {} + +find networkx -name '*test*.py' -exec grep -q '#!%__$python' {} \; -exec chmod a+x {} + # Deduplicating files can generate a RPMLINT warning for pyc mtime find networkx -name '*test*.py' -exec $python -m compileall -d %{$python_sitelib} {} \; find networkx -name '*test*.py' -exec $python -O -m compileall -d %{$python_sitelib} {} \; @@ -100,15 +100,18 @@ popd } +%check +# test excluded because it leads to crashes on i586, gh#networkx/networkx#3304 +%pytest -k 'not test_subgraph_centrality_big_graph' + %files %{python_files} -%defattr(-,root,root) -%doc README.rst LICENSE.txt CONTRIBUTING.rst +%license LICENSE.txt +%doc README.rst CONTRIBUTING.rst %{python_sitelib}/networkx/ %{python_sitelib}/networkx-%{version}-py*.egg-info %files -n %{name}-doc -%defattr(-,root,root) -%doc LICENSE.txt +%license LICENSE.txt %{_docdir}/networkx-%{version}/ %changelog ++++++ numpy-38-test.patch ++++++ diff --git a/networkx/readwrite/tests/test_gexf.py b/networkx/readwrite/tests/test_gexf.py index afc40111..f16504c0 100644 --- a/networkx/readwrite/tests/test_gexf.py +++ b/networkx/readwrite/tests/test_gexf.py @@ -404,7 +404,8 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2"> nx.set_node_attributes(G, {n: n for n in numpy.arange(4)}, 'number') G[0][1]['edge-number'] = numpy.float64(1.1) - expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\ + if sys.version_info < (3, 8): + expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\ ="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd"> <meta lastmodifieddate="{}"> @@ -449,6 +450,54 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2"> <edge id="2" source="2" target="3" /> </edges> </graph> +</gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__) + else: + expected = """<gexf xmlns="http://www.gexf.net/1.2draft"\ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\ +="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd"\ + version="1.2"> + <meta lastmodifieddate="{}"> + <creator>NetworkX {}</creator> + </meta> + <graph defaultedgetype="undirected" mode="static" name=""> + <attributes mode="static" class="edge"> + <attribute id="1" title="edge-number" type="float" /> + </attributes> + <attributes mode="static" class="node"> + <attribute id="0" title="number" type="int" /> + </attributes> + <nodes> + <node id="0" label="0"> + <attvalues> + <attvalue for="0" value="0" /> + </attvalues> + </node> + <node id="1" label="1"> + <attvalues> + <attvalue for="0" value="1" /> + </attvalues> + </node> + <node id="2" label="2"> + <attvalues> + <attvalue for="0" value="2" /> + </attvalues> + </node> + <node id="3" label="3"> + <attvalues> + <attvalue for="0" value="3" /> + </attvalues> + </node> + </nodes> + <edges> + <edge source="0" target="1" id="0"> + <attvalues> + <attvalue for="1" value="1.1" /> + </attvalues> + </edge> + <edge source="1" target="2" id="1" /> + <edge source="2" target="3" id="2" /> + </edges> + </graph> </gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__) obtained = '\n'.join(nx.generate_gexf(G)) assert expected == obtained