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

Accepting request 867184 from home:mcalabkova:branches:devel:languages:python

Browse Source 
- Add yaml-loader.patch adding support for new PyYAML

OBS-URL: https://build.opensuse.org/request/show/867184
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-networkx?expand=0&rev=31
This commit is contained in:
Markéta Machová 2021-01-27 13:03:37 +00:00 committed by Git OBS Bridge
parent 272a4ad474
commit 420b614820
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-networkx.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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>

4
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
@ -27,6 +27,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