forked from pool/python-networkx
Accepting request 909685 from devel:languages:python:numeric
- require pandas
- update to 2.6.2:
* This release is the result of 11 months of work with over 363 pull requests by
91 contributors. Highlights include:
* Dropped support for Python 3.6.
* NumPy, SciPy, Matplotlib, and pandas are now default requirements.
* NetworkX no longer depends on the library "decorator".
* Improved example gallery
* Removed code for supporting Jython/IronPython
* The __str__ method for graph objects is more informative and concise.
* Improved import time
* Improved test coverage
* New documentation theme
* Add functionality for drawing self-loop edges
* Add approximation algorithms for Traveling Salesman Problem
- drop 0001-Replace-hash-function-for-test-of-weighted-astar.patch,
yaml-loader.patch (merged upstream)
OBS-URL: https://build.opensuse.org/request/show/909685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-networkx?expand=0&rev=30
This commit is contained in:
Richard Brown
Git OBS Bridge
commit
514cbcb410
@ -1,25 +0,0 @@
|
||||
From 7e4ddaa2e1745cdb3ed9969680d755ce81ddcdfd Mon Sep 17 00:00:00 2001
|
||||
From: Ross Barnowski <rossbar@berkeley.edu>
|
||||
Date: Mon, 5 Oct 2020 13:36:55 -0700
|
||||
Subject: [PATCH] TST: Modify heuristic for astar path test.
|
||||
|
||||
Replace hash() with a sum-of-squares heuristic in
|
||||
test_weight_functions so that the heuristic is not
|
||||
platform-dependent.
|
||||
---
|
||||
networkx/algorithms/shortest_paths/tests/test_weighted.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/networkx/algorithms/shortest_paths/tests/test_weighted.py b/networkx/algorithms/shortest_paths/tests/test_weighted.py
|
||||
index b234618c4c..a4ba92c023 100644
|
||||
--- a/networkx/algorithms/shortest_paths/tests/test_weighted.py
|
||||
+++ b/networkx/algorithms/shortest_paths/tests/test_weighted.py
|
||||
@@ -198,7 +198,7 @@ def test_bidirectional_dijkstra(self):
|
||||
|
||||
def test_weight_functions(self):
|
||||
def heuristic(*z):
|
||||
- return hash(z)
|
||||
+ return sum(val ** 2 for val in z)
|
||||
|
||||
def getpath(pred, v, s):
|
||||
return [v] if v == s else getpath(pred, pred[v], s) + [v]
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a
|
||||
size 1540139
|
||||
3
networkx-2.6.1.tar.gz
Normal file
3
networkx-2.6.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bf4cb807d1bccf1593c7d0742d9127d9e04e021867299082658b0fc3907924e8
|
||||
size 1842369
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 2 07:28:15 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- require pandas
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 28 23:30:34 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 2.6.2:
|
||||
* This release is the result of 11 months of work with over 363 pull requests by
|
||||
91 contributors. Highlights include:
|
||||
|
||||
* Dropped support for Python 3.6.
|
||||
* NumPy, SciPy, Matplotlib, and pandas are now default requirements.
|
||||
* NetworkX no longer depends on the library "decorator".
|
||||
* Improved example gallery
|
||||
* Removed code for supporting Jython/IronPython
|
||||
* The __str__ method for graph objects is more informative and concise.
|
||||
* Improved import time
|
||||
* Improved test coverage
|
||||
* New documentation theme
|
||||
* Add functionality for drawing self-loop edges
|
||||
* Add approximation algorithms for Traveling Salesman Problem
|
||||
- drop 0001-Replace-hash-function-for-test-of-weighted-astar.patch,
|
||||
yaml-loader.patch (merged upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 18 21:51:38 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
||||
@ -18,32 +18,29 @@
|
||||
|
||||
%{?!python_module:%define python_module() python3-%{**}}
|
||||
%define skip_python2 1
|
||||
%define skip_python36 1
|
||||
Name: python-networkx
|
||||
Version: 2.5.1
|
||||
Version: 2.6.1
|
||||
Release: 0
|
||||
Summary: Python package for the study of complex networks
|
||||
License: BSD-3-Clause
|
||||
URL: https://networkx.github.io/
|
||||
Source: https://files.pythonhosted.org/packages/source/n/networkx/networkx-%{version}.tar.gz
|
||||
Patch0: 0001-Replace-hash-function-for-test-of-weighted-astar.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/networkx/networkx/commit/a6dd458a12ad8db161271e2271644803d4f29a96 fixes Github Actions failures
|
||||
Patch1: yaml-loader.patch
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: unzip
|
||||
Requires: python-decorator >= 3.4.0
|
||||
Recommends: python-PyYAML
|
||||
Recommends: python-pydot
|
||||
Recommends: python-pygraphviz
|
||||
Recommends: python-pyparsing
|
||||
Suggests: python-matplotlib >= 3.1
|
||||
Suggests: python-pandas
|
||||
Suggests: python-scipy
|
||||
Requires: python-matplotlib >= 3.1
|
||||
Requires: python-numpy
|
||||
Requires: python-pandas
|
||||
Requires: python-scipy
|
||||
BuildArch: noarch
|
||||
# SECTION test requirements
|
||||
BuildRequires: %{python_module PyYAML}
|
||||
BuildRequires: %{python_module decorator >= 3.4.0}
|
||||
BuildRequires: %{python_module lxml}
|
||||
BuildRequires: %{python_module pydot}
|
||||
BuildRequires: %{python_module pygraphviz}
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
From a6dd458a12ad8db161271e2271644803d4f29a96 Mon Sep 17 00:00:00 2001
|
||||
From: Douglas Fenstermacher <douglas.fenstermacher@gmail.com>
|
||||
Date: Wed, 20 Jan 2021 10:47:56 -0500
|
||||
Subject: [PATCH] fixes Github Actions failures (#4548)
|
||||
|
||||
Github Actions failing due to new release of pyyaml==5.4, this change should resolve that issue
|
||||
---
|
||||
networkx/readwrite/nx_yaml.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/networkx/readwrite/nx_yaml.py b/networkx/readwrite/nx_yaml.py
|
||||
index 80bd5dfd0c..98b4b1d9cb 100644
|
||||
--- a/networkx/readwrite/nx_yaml.py
|
||||
+++ b/networkx/readwrite/nx_yaml.py
|
||||
@@ -102,5 +102,5 @@ def read_yaml(path):
|
||||
except ImportError as e:
|
||||
raise ImportError("read_yaml() requires PyYAML: http://pyyaml.org/") from e
|
||||
|
||||
- G = yaml.load(path, Loader=yaml.FullLoader)
|
||||
+ G = yaml.load(path, Loader=yaml.Loader)
|
||||
return G
|
||||
Loading…
x
Reference in New Issue
Block a user