From 542624fbeb2d19a9254cab13b4f074d84395d7963fdd0bdde1196d00dcb6da6e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 20 Feb 2021 18:13:48 +0000 Subject: [PATCH 1/2] Accepting request 873985 from home:jayvdb:branches:devel:languages:python:numeric - Re-enable Python 3.6 builds without optional dependencies - Add test dependencies lxml, pandas and pygraphviz OBS-URL: https://build.opensuse.org/request/show/873985 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-networkx?expand=0&rev=36 --- python-networkx.changes | 6 ++++++ python-networkx.spec | 35 +++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/python-networkx.changes b/python-networkx.changes index 23cd259..51cc940 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 20 05:07:31 UTC 2021 - John Vandenberg + +- Re-enable Python 3.6 builds without optional dependencies +- Add test dependencies lxml, pandas and pygraphviz + ------------------------------------------------------------------- Mon Feb 1 14:05:38 UTC 2021 - Benjamin Greiner diff --git a/python-networkx.spec b/python-networkx.spec index ddfd1de..968b875 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -18,7 +18,6 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 -%define skip_python36 1 Name: python-networkx Version: 2.5 Release: 0 @@ -29,26 +28,37 @@ Source: https://files.pythonhosted.org/packages/source/n/networkx/networ 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} -BuildRequires: %{python_module pydot} -BuildRequires: %{python_module pyparsing} -BuildRequires: %{python_module pytest-xdist} -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 >= 3.1 Recommends: python-pydot Recommends: python-pygraphviz Recommends: python-pyparsing -Recommends: python-scipy +Suggests: python-matplotlib >= 3.1 +Suggests: python-pandas +Suggests: 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} +BuildRequires: %{python_module pyparsing} +BuildRequires: %{python_module pytest-xdist} +BuildRequires: %{python_module pytest} +BuildRequires: (python3-matplotlib >= 3.1 if python3-base < 3.8) +BuildRequires: (python3-numpy if python3-base < 3.8) +BuildRequires: (python3-pandas if python3-base < 3.8) +BuildRequires: (python3-scipy if python3-base < 3.8) +BuildRequires: (python38-matplotlib >= 3.1 if python38-base) +BuildRequires: (python38-numpy if python38-base) +BuildRequires: (python38-pandas if python38-base) +BuildRequires: (python38-scipy if python38-base) +# /SECTION %python_subpackages %description @@ -104,7 +114,8 @@ popd %check # gh#networkx/networkx#4030 we cannot use -n auto because # TestKatzCentralityDirectedNumpy fails otherwise -%pytest +# (pandas) test_from_adjacency_named fails on i586 +%pytest -rs -k 'not test_from_adjacency_named' %files %{python_files} %license LICENSE.txt From 1d230639f248d78a012b1d36631fedd570c9adb3e7a0b31acbb7ca74c7f33577 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 23 Feb 2021 18:50:37 +0000 Subject: [PATCH 2/2] Accepting request 874668 from home:bnavigator:branches:devel:languages:python:numeric - Refine the optional test dependencies. We want to test python39 in the future. "Never say never again", I guess. The drop of python36 "for good" was not that long actually. :p OBS-URL: https://build.opensuse.org/request/show/874668 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-networkx?expand=0&rev=37 --- python-networkx.changes | 6 ++++++ python-networkx.spec | 14 +++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/python-networkx.changes b/python-networkx.changes index 51cc940..c6f0479 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 23 18:12:59 UTC 2021 - Ben Greiner + +- Refine the optional test dependencies. We want to test python39 + in the future. + ------------------------------------------------------------------- Sat Feb 20 05:07:31 UTC 2021 - John Vandenberg diff --git a/python-networkx.spec b/python-networkx.spec index 968b875..585fbc7 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -16,7 +16,7 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-networkx Version: 2.5 @@ -50,14 +50,10 @@ BuildRequires: %{python_module pygraphviz} BuildRequires: %{python_module pyparsing} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} -BuildRequires: (python3-matplotlib >= 3.1 if python3-base < 3.8) -BuildRequires: (python3-numpy if python3-base < 3.8) -BuildRequires: (python3-pandas if python3-base < 3.8) -BuildRequires: (python3-scipy if python3-base < 3.8) -BuildRequires: (python38-matplotlib >= 3.1 if python38-base) -BuildRequires: (python38-numpy if python38-base) -BuildRequires: (python38-pandas if python38-base) -BuildRequires: (python38-scipy if python38-base) +BuildRequires: %{python_module matplotlib >= 3.1 if (%python-base without python36-base)} +BuildRequires: %{python_module numpy if (%python-base without python36-base)} +BuildRequires: %{python_module pandas if (%python-base without python36-base)} +BuildRequires: %{python_module scipy if (%python-base without python36-base)} # /SECTION %python_subpackages