From 1ea6cc2e5407ab191d80c432baed95587e690964aeeb05c1b4533344726ad19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 23 Feb 2024 12:07:41 +0000 Subject: [PATCH 1/3] Accepting request 1149561 from home:lkocman:branches:devel:languages:python:numeric - Disable tests for Leap 15 / SLES 15 re-add dropped changelog entry bsc#1184340 and bsc#1198319 OBS-URL: https://build.opensuse.org/request/show/1149561 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-matplotlib?expand=0&rev=85 --- python-matplotlib.changes | 6 ++++++ python-matplotlib.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/python-matplotlib.changes b/python-matplotlib.changes index 6955377..be0ba6f 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 22 15:09:27 UTC 2024 - Lubos Kocman + +- Disable tests for Leap 15 / SLES 15 + re-add dropped changelog entry bsc#1184340 and bsc#1198319 + ------------------------------------------------------------------- Tue Jan 23 17:01:35 UTC 2024 - Stefan Dirsch diff --git a/python-matplotlib.spec b/python-matplotlib.spec index d475b30..ecb5d97 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -19,7 +19,14 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test +%if 0%{?suse_version} < 1550 +# Leap15, SLES15 +# Not doing tests because they take too long +# The tests also pull in dependencies of all backends done in pure python +%bcond_with test +%else %bcond_without test +%endif # Run on 64bit intel and arm only, on others there are >100 test failures ExclusiveArch: x86_64 aarch64 %else From 47718e923c9c5716c04702b6628b302f7627f475398ef3f05c689c484c437a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 23 Feb 2024 12:14:08 +0000 Subject: [PATCH 2/3] Accepting request 1149747 from Application:ERP:GNUHealth:4.4 OBS-URL: https://build.opensuse.org/request/show/1149747 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-matplotlib?expand=0&rev=86 --- python-matplotlib.changes | 9 +++++++++ python-matplotlib.spec | 14 +++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/python-matplotlib.changes b/python-matplotlib.changes index be0ba6f..e018674 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 23 07:40:01 UTC 2024 - Max Lin + +- Disable nbagg and wx plugin on Leap15/SLE15 + * Leap 15 doesn't have IPython stack with python 3.11 build + * python-wxPython with python 3.11 supported needs wxWidgets + version >= 3.2.0 as the minimal requirement which Leap15/SLE15 + don't have that + ------------------------------------------------------------------- Thu Feb 22 15:09:27 UTC 2024 - Lubos Kocman diff --git a/python-matplotlib.spec b/python-matplotlib.spec index ecb5d97..0de515a 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -95,12 +95,16 @@ BuildRequires: %{python_module matplotlib = %{version}} BuildRequires: %{python_module matplotlib-cairo = %{version}} BuildRequires: %{python_module matplotlib-gtk3 = %{version}} BuildRequires: %{python_module matplotlib-gtk4 = %{version}} +%if 0%{?suse_version} > 1500 BuildRequires: %{python_module matplotlib-nbagg = %{version}} +%endif BuildRequires: %{python_module matplotlib-qt5 = %{version}} BuildRequires: %{python_module matplotlib-testdata = %{version}} BuildRequires: %{python_module matplotlib-tk = %{version}} BuildRequires: %{python_module matplotlib-web = %{version}} +%if 0%{?suse_version} > 1500 BuildRequires: %{python_module matplotlib-wx = %{version}} +%endif BuildRequires: %{python_module psutil} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest-xvfb} @@ -117,7 +121,7 @@ BuildRequires: %{python_module cairo >= 1.14.0} BuildRequires: %{python_module cairocffi >= 0.8} # /SECTION cairo # SECTION nbagg backend tests -%if !%{with ringdisabled} +%if !%{with ringdisabled} && 0%{?suse_version} > 1500 BuildRequires: %{python_module nbconvert} BuildRequires: %{python_module nbformat} %endif @@ -182,6 +186,7 @@ Requires: python-gobject-cairo This package provides code common for the GTK3 and GTK4 backends for the %{name} plotting package +%if 0%{?suse_version} > 1500 %package nbagg Summary: Jupyter nbagg backend for %{name} Requires: %{name} = %{version} @@ -190,6 +195,7 @@ Requires: python-ipykernel %description nbagg This package includes the Jupyter notebook backend for the %{name} plotting package +%endif %package latex Summary: Allow rendering latex in %{name} @@ -271,6 +277,7 @@ Requires: python-tornado This package includes the browser-based webagg backend for the %{name} plotting package +%if 0%{?suse_version} > 1500 %package wx Summary: WxWidgets backend for %{name} Requires: %{name} = %{version} @@ -279,6 +286,7 @@ Requires: python-wxPython >= 4 %description wx This package includes the wxWidgets-based wxagg backend for %{name} plotting package +%endif %prep %autosetup -p1 -n matplotlib-%{version} @@ -460,11 +468,13 @@ $python -m pytest --pyargs matplotlib.tests \ %{python_sitearch}/matplotlib/backends/_backend_gtk.py %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/_backend_gtk.*.py* +%if 0%{?suse_version} > 1500 %files %{python_files nbagg} %license LICENSE/ %license doc/users/project/license.rst %{python_sitearch}/matplotlib/backends/backend_nbagg.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_nbagg.*.py* +%endif %files %{python_files qt} %license LICENSE/ @@ -510,6 +520,7 @@ $python -m pytest --pyargs matplotlib.tests \ %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg.*.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg_core.*.py* +%if 0%{?suse_version} > 1500 %files %{python_files wx} %license LICENSE/ %license doc/users/project/license.rst @@ -520,5 +531,6 @@ $python -m pytest --pyargs matplotlib.tests \ %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_wxagg.*.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_wxcairo.*.py* %endif +%endif %changelog From a307fcf395a1beaad5f8388947891c31e169367bf2f00bf1a23159a3a2ff8dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 23 Feb 2024 13:34:52 +0000 Subject: [PATCH 3/3] Accepting request 1149931 from home:mlin7442:rebuild_fails_156:gnuhealth Drop changes from lkocman. * parallel change from Max fixes the issue OBS-URL: https://build.opensuse.org/request/show/1149931 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-matplotlib?expand=0&rev=87 --- python-matplotlib.changes | 6 ------ python-matplotlib.spec | 7 ------- 2 files changed, 13 deletions(-) diff --git a/python-matplotlib.changes b/python-matplotlib.changes index e018674..273f1d7 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -7,12 +7,6 @@ Fri Feb 23 07:40:01 UTC 2024 - Max Lin version >= 3.2.0 as the minimal requirement which Leap15/SLE15 don't have that -------------------------------------------------------------------- -Thu Feb 22 15:09:27 UTC 2024 - Lubos Kocman - -- Disable tests for Leap 15 / SLES 15 - re-add dropped changelog entry bsc#1184340 and bsc#1198319 - ------------------------------------------------------------------- Tue Jan 23 17:01:35 UTC 2024 - Stefan Dirsch diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 0de515a..1c97421 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -19,14 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test -%if 0%{?suse_version} < 1550 -# Leap15, SLES15 -# Not doing tests because they take too long -# The tests also pull in dependencies of all backends done in pure python -%bcond_with test -%else %bcond_without test -%endif # Run on 64bit intel and arm only, on others there are >100 test failures ExclusiveArch: x86_64 aarch64 %else