From 272a4ad47455e98287e8eb29c5372ef0028789ecc7fb8fde784a1a3cd19cb464 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 18 Jan 2021 06:58:48 +0000 Subject: [PATCH 1/3] Accepting request 863950 from home:bnavigator:branches:devel:languages:python:numeric - Skip python36 because of SciPy 1.6.0 OBS-URL: https://build.opensuse.org/request/show/863950 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-networkx?expand=0&rev=30 --- python-networkx.changes | 5 +++++ python-networkx.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-networkx.changes b/python-networkx.changes index 431f733..323b2ea 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 18 01:43:05 UTC 2021 - Benjamin Greiner + +- Skip python36 because of SciPy 1.6.0 + ------------------------------------------------------------------- Tue Oct 6 11:47:47 UTC 2020 - Antonio Larrosa diff --git a/python-networkx.spec b/python-networkx.spec index 78810ca..e5ffcd4 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -18,6 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +%define skip_python36 1 Name: python-networkx Version: 2.5 Release: 0 From 420b6148208c81960a4803e0619f194067e0f326b1d234021c170aad1878b4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 27 Jan 2021 13:03:37 +0000 Subject: [PATCH 2/3] Accepting request 867184 from home:mcalabkova:branches:devel:languages:python - 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 --- python-networkx.changes | 5 +++++ python-networkx.spec | 4 +++- yaml-loader.patch | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 yaml-loader.patch diff --git a/python-networkx.changes b/python-networkx.changes index 323b2ea..37f1a2e 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 27 12:55:26 UTC 2021 - Markéta Machová + +- Add yaml-loader.patch adding support for new PyYAML + ------------------------------------------------------------------- Mon Jan 18 01:43:05 UTC 2021 - Benjamin Greiner diff --git a/python-networkx.spec b/python-networkx.spec index e5ffcd4..239f333 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -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} diff --git a/yaml-loader.patch b/yaml-loader.patch new file mode 100644 index 0000000..d73d8de --- /dev/null +++ b/yaml-loader.patch @@ -0,0 +1,21 @@ +From a6dd458a12ad8db161271e2271644803d4f29a96 Mon Sep 17 00:00:00 2001 +From: Douglas Fenstermacher +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 From 997ad908e87397c9b607519635931d648c7930ff2d5089d6eac3c05d6b37c5f1 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 30 Jan 2021 12:50:32 +0000 Subject: [PATCH 3/3] Accepting request 867833 from home:bnavigator:branches:devel:languages:python:numeric - Temporarily reenable python36 build until SciPy is updated, because the PyYAML fix needs to be merged first OBS-URL: https://build.opensuse.org/request/show/867833 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-networkx?expand=0&rev=32 --- python-networkx.changes | 6 ++++++ python-networkx.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-networkx.changes b/python-networkx.changes index 37f1a2e..262d8f0 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 30 01:42:49 UTC 2021 - Ben Greiner + +- 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á diff --git a/python-networkx.spec b/python-networkx.spec index 239f333..dd8e157 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -18,7 +18,8 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 -%define skip_python36 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