rpm/python-networkx
SHA256
1
0
Fork 0
forked from pool/python-networkx
Code Pull Requests Activity

Accepting request 867976 from devel:languages:python:numeric

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/867976
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-networkx?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2021-02-01 12:27:14 +00:00 committed by Git OBS Bridge
commit 3d53b49f5a
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python-networkx.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sat Jan 30 01:42:49 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Temporarily reenable python36 build until SciPy is updated,
because the PyYAML fix needs to be merged first
-------------------------------------------------------------------
Wed Jan 27 12:55:26 UTC 2021 - Markéta Machová <mmachova@suse.com>
- Add yaml-loader.patch adding support for new PyYAML
-------------------------------------------------------------------
Mon Jan 18 01:43:05 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
- Skip python36 because of SciPy 1.6.0
-------------------------------------------------------------------
Tue Oct 6 11:47:47 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>

6
python-networkx.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-networkx
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,6 +18,8 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
# Temporarily reenabled until SciPy is updated, because the PyYAML fix needs to be merged first
#%%define skip_python36 1
Name: python-networkx
Version: 2.5
Release: 0
@ -26,6 +28,8 @@ 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 PyYAML}
BuildRequires: %{python_module decorator >= 3.4.0}
BuildRequires: %{python_module matplotlib >= 3.1}

21
yaml-loader.patch Normal file
View File

@ -0,0 +1,21 @@
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