Compare commits
1 Commits
factory
...
new-in-lea
| Author | SHA256 | Date | |
|---|---|---|---|
|
|
2c64642cbf
|
36
Pillow-13-compat.patch
Normal file
36
Pillow-13-compat.patch
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
From 0b2fa3f952b6b97a121a3d7f05a0753b52b802cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= <cr52@protonmail.com>
|
||||||
|
Date: Sat, 28 Jun 2025 11:39:49 +0200
|
||||||
|
Subject: [PATCH] BUG: fix future incompatibility with Pillow 13
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/matplotlib/backends/_backend_tk.py | 2 +-
|
||||||
|
lib/matplotlib/backends/backend_pdf.py | 2 ++-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
|
||||||
|
index 0bbff1379ffa..eaf868fd8bec 100644
|
||||||
|
--- a/lib/matplotlib/backends/_backend_tk.py
|
||||||
|
+++ b/lib/matplotlib/backends/_backend_tk.py
|
||||||
|
@@ -775,7 +775,7 @@ def _recolor_icon(image, color):
|
||||||
|
image_data = np.asarray(image).copy()
|
||||||
|
black_mask = (image_data[..., :3] == 0).all(axis=-1)
|
||||||
|
image_data[black_mask, :3] = color
|
||||||
|
- return Image.fromarray(image_data, mode="RGBA")
|
||||||
|
+ return Image.fromarray(image_data)
|
||||||
|
|
||||||
|
# Use the high-resolution (48x48 px) icon if it exists and is needed
|
||||||
|
with Image.open(path_large if (size > 24 and path_large.exists())
|
||||||
|
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
|
||||||
|
index f20bdffd4a3a..4429dc9ba707 100644
|
||||||
|
--- a/lib/matplotlib/backends/backend_pdf.py
|
||||||
|
+++ b/lib/matplotlib/backends/backend_pdf.py
|
||||||
|
@@ -1784,7 +1784,7 @@ def _writeImg(self, data, id, smask=None):
|
||||||
|
data[:, :, 2])
|
||||||
|
indices = np.argsort(palette24).astype(np.uint8)
|
||||||
|
rgb8 = indices[np.searchsorted(palette24, rgb24, sorter=indices)]
|
||||||
|
- img = Image.fromarray(rgb8, mode='P')
|
||||||
|
+ img = Image.fromarray(rgb8).convert("P")
|
||||||
|
img.putpalette(palette)
|
||||||
|
png_data, bit_depth, palette = self._writePng(img)
|
||||||
|
if bit_depth is None or palette is None:
|
||||||
BIN
matplotlib-3.10.3.tar.gz
LFS
Normal file
BIN
matplotlib-3.10.3.tar.gz
LFS
Normal file
Binary file not shown.
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a06ba7e2a2ef9131c79c49e63dad355d2d878413a0376c1727c8b9335ff731c7
|
|
||||||
size 34804865
|
|
||||||
@@ -1,43 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Tue Nov 11 10:55:03 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
|
||||||
|
|
||||||
- Revert the skipped test with gc, fixed in gc upstream (bsc#1252721)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Nov 3 09:06:33 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
|
||||||
|
|
||||||
- Skip tests failing with new package versions in Factory (bsc#1252721)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Oct 13 14:51:30 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
|
||||||
|
|
||||||
- Update to 3.10.7
|
|
||||||
* The most important update in this release is that the minimum version
|
|
||||||
of pyparsing has been updated to version 3.0.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Sep 25 12:01:16 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
|
|
||||||
|
|
||||||
- Skip a couple of tests that fails with the latest ghostscript
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Sep 18 11:39:49 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
|
||||||
|
|
||||||
- Update to 3.10.6
|
|
||||||
* Fix regression of hi-dpi support for Qt
|
|
||||||
* Fix race condition in TexManager.make_dvi & make_png
|
|
||||||
* Various documentation and other bugfixes
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Aug 18 11:18:14 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
|
|
||||||
|
|
||||||
- Update to 3.10.5
|
|
||||||
* Bugfix release. No notable changes beyond the GitHub
|
|
||||||
statistics of merged PRs.
|
|
||||||
(https://matplotlib.org/stable/users/github_stats.html#github-stats)
|
|
||||||
- Remove "%python-numpy-devel < 2.3" BuildRequires upper limit
|
|
||||||
- Drop not needed patch Pillow-13-compat.patch
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 3 07:36:25 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
|
Thu Jul 3 07:36:25 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-matplotlib
|
# spec file for package python-matplotlib
|
||||||
#
|
#
|
||||||
# Copyright (c) 2025 SUSE LLC and contributors
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -46,7 +46,7 @@ ExclusiveArch: x86_64 aarch64
|
|||||||
|
|
||||||
%{?sle15_python_module_pythons}
|
%{?sle15_python_module_pythons}
|
||||||
Name: python-matplotlib%{psuffix}
|
Name: python-matplotlib%{psuffix}
|
||||||
Version: 3.10.7
|
Version: 3.10.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Plotting Library for Python
|
Summary: Plotting Library for Python
|
||||||
License: SUSE-Matplotlib
|
License: SUSE-Matplotlib
|
||||||
@@ -59,6 +59,8 @@ Source99: https://downloads.sourceforge.net/project/freetype/freetype2/2.6
|
|||||||
Source100: python-matplotlib.rpmlintrc
|
Source100: python-matplotlib.rpmlintrc
|
||||||
# PATCH-FEATURE-OPENSUSE matplotlib-meson-options-opensuse.patch code@bnavigator.de -- Custom build options for meson-python
|
# PATCH-FEATURE-OPENSUSE matplotlib-meson-options-opensuse.patch code@bnavigator.de -- Custom build options for meson-python
|
||||||
Patch1: matplotlib-meson-options-opensuse.patch
|
Patch1: matplotlib-meson-options-opensuse.patch
|
||||||
|
# PATCH-FIX-UPSTREAM Pillow-13-compat.patch https://github.com/matplotlib/matplotlib/pull/30221
|
||||||
|
Patch2: Pillow-13-compat.patch
|
||||||
Recommends: ghostscript
|
Recommends: ghostscript
|
||||||
Recommends: libxml2-tools
|
Recommends: libxml2-tools
|
||||||
Recommends: poppler-tools
|
Recommends: poppler-tools
|
||||||
@@ -69,7 +71,7 @@ Obsoletes: python-matplotlib-gtk < %{version}
|
|||||||
# SECTION build
|
# SECTION build
|
||||||
BuildRequires: %{python_module devel >= 3.9}
|
BuildRequires: %{python_module devel >= 3.9}
|
||||||
BuildRequires: %{python_module meson-python >= 0.13.1}
|
BuildRequires: %{python_module meson-python >= 0.13.1}
|
||||||
BuildRequires: %{python_module numpy-devel >= 1.25}
|
BuildRequires: %{python_module numpy-devel >= 1.25 with %python-numpy-devel < 2.3}
|
||||||
BuildRequires: %{python_module pip}
|
BuildRequires: %{python_module pip}
|
||||||
BuildRequires: %{python_module pybind11-devel >= 2.6}
|
BuildRequires: %{python_module pybind11-devel >= 2.6}
|
||||||
BuildRequires: %{python_module setuptools_scm >= 7}
|
BuildRequires: %{python_module setuptools_scm >= 7}
|
||||||
@@ -88,12 +90,12 @@ BuildRequires: pkgconfig(tcl)
|
|||||||
# SECTION runtime
|
# SECTION runtime
|
||||||
Requires: python-Cycler >= 0.10
|
Requires: python-Cycler >= 0.10
|
||||||
Requires: python-FontTools >= 4.22.0
|
Requires: python-FontTools >= 4.22.0
|
||||||
Requires: python-Pillow >= 9
|
Requires: python-Pillow >= 8
|
||||||
Requires: python-contourpy >= 1.0.1
|
Requires: python-contourpy >= 1.0.1
|
||||||
Requires: python-kiwisolver >= 1.3.1
|
Requires: python-kiwisolver >= 1.3.1
|
||||||
Requires: python-numpy >= 1.25
|
Requires: python-numpy >= 1.23
|
||||||
Requires: python-packaging >= 20.0
|
Requires: python-packaging >= 20.0
|
||||||
Requires: python-pyparsing >= 3
|
Requires: python-pyparsing > 2.3.1
|
||||||
Requires: python-python-dateutil >= 2.7
|
Requires: python-python-dateutil >= 2.7
|
||||||
# /SECTION
|
# /SECTION
|
||||||
# SECTION test
|
# SECTION test
|
||||||
@@ -104,7 +106,6 @@ BuildRequires: %{python_module matplotlib-gtk4 = %{version}}
|
|||||||
BuildRequires: %{python_module matplotlib-testdata = %{version}}
|
BuildRequires: %{python_module matplotlib-testdata = %{version}}
|
||||||
BuildRequires: %{python_module matplotlib-tk = %{version}}
|
BuildRequires: %{python_module matplotlib-tk = %{version}}
|
||||||
BuildRequires: %{python_module matplotlib-web = %{version}}
|
BuildRequires: %{python_module matplotlib-web = %{version}}
|
||||||
BuildRequires: %{python_module pandas}
|
|
||||||
BuildRequires: %{python_module psutil}
|
BuildRequires: %{python_module psutil}
|
||||||
BuildRequires: %{python_module pytest-xdist}
|
BuildRequires: %{python_module pytest-xdist}
|
||||||
BuildRequires: %{python_module pytest-xvfb}
|
BuildRequires: %{python_module pytest-xvfb}
|
||||||
@@ -125,8 +126,8 @@ BuildRequires: %{python_module cairocffi >= 0.8}
|
|||||||
# SECTION nbagg backend tests: not in Minimal-X or SLE <= 16
|
# SECTION nbagg backend tests: not in Minimal-X or SLE <= 16
|
||||||
%if %{without ringdisabled} && 0%{?suse_version} > %SLE_VERSION
|
%if %{without ringdisabled} && 0%{?suse_version} > %SLE_VERSION
|
||||||
BuildRequires: %{python_module matplotlib-nbagg = %{version}}
|
BuildRequires: %{python_module matplotlib-nbagg = %{version}}
|
||||||
BuildRequires: %{python_module nbconvert}
|
BuildRequires: %{python_module nbconvert if %python-base >= 3.10}
|
||||||
BuildRequires: %{python_module nbformat}
|
BuildRequires: %{python_module nbformat if %python-base >= 3.10}
|
||||||
%endif
|
%endif
|
||||||
# /SECTION nbagg
|
# /SECTION nbagg
|
||||||
# SECTION qt backend tests
|
# SECTION qt backend tests
|
||||||
@@ -357,11 +358,6 @@ skip_tests+=" or png or svg or pdf"
|
|||||||
%endif
|
%endif
|
||||||
# test failure with texlive 2025 https://github.com/matplotlib/matplotlib/issues/29790
|
# test failure with texlive 2025 https://github.com/matplotlib/matplotlib/issues/29790
|
||||||
skip_tests+=" or (test_backend_pgf and test_rcupdate)"
|
skip_tests+=" or (test_backend_pgf and test_rcupdate)"
|
||||||
# test failures with newer ghostscript
|
|
||||||
skip_tests+=" or test_bbox_inches_tight_raster[pdf] or test_interp_nearest_vs_none[pdf]"
|
|
||||||
# test failures uncovered by xkeyboard-config https://github.com/matplotlib/matplotlib/issues/30703
|
|
||||||
skip_tests+=" or (test_getattr and gtk3)"
|
|
||||||
skip_tests+=" or test_determinism_check or test_determinism_source_date_epoch"
|
|
||||||
|
|
||||||
# Fails in SLFO:Main
|
# Fails in SLFO:Main
|
||||||
%if 0%{?suse_version} <= %SLE_VERSION
|
%if 0%{?suse_version} <= %SLE_VERSION
|
||||||
|
|||||||
Reference in New Issue
Block a user