Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14b07f66b9 | ||
|
|
dd4b1792bc | ||
|
|
93f88a6307 | ||
|
|
853e3b217e | ||
|
|
d4f07f68ab | ||
|
|
e71d6832cc | ||
|
|
dbe22df6a2 | ||
|
|
4ed16b6299 | ||
|
|
ca0fc90842 | ||
|
|
50a5dee18f | ||
|
|
15d6bc1d48 | ||
|
|
4e3179c9e2 | ||
|
|
c4148f5979 |
10
.gitignore
vendored
10
.gitignore
vendored
@@ -58,3 +58,13 @@ matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/matplotlib-3.3.3.tar.gz
|
||||
/matplotlib-3.3.3-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.3.4.tar.gz
|
||||
/matplotlib-3.4.0rc1.tar.gz
|
||||
/matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.4.0rc3.tar.gz
|
||||
/matplotlib-3.4.1.tar.gz
|
||||
/matplotlib-3.4.1-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.4.2.tar.gz
|
||||
/matplotlib-3.4.1-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.4.3.tar.gz
|
||||
/matplotlib-3.4.3-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.4.3-with-freetype-2.11.0.tar.gz
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From edf0b7412cd5cdf6e07f035d542c93033c374b37 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas A Caswell <tcaswell@gmail.com>
|
||||
Date: Fri, 1 Apr 2022 11:46:32 -0400
|
||||
Subject: [PATCH] FIX: account for constant deprecations in Pillow 9.1
|
||||
|
||||
https://pillow.readthedocs.io/en/stable/deprecations.html#constants
|
||||
https://pillow.readthedocs.io/en/stable/releasenotes/9.1.0.html#constants
|
||||
|
||||
Image.None -> Image.Dither.None
|
||||
Image.ADAPTIVE -> Image.Palette.ADAPTIVE
|
||||
|
||||
(cherry picked from commit bb997708c08dae01ac95104f1f33d8c08c4715d4)
|
||||
---
|
||||
lib/matplotlib/backends/backend_pdf.py | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
|
||||
index 26a12764da..fa7d4a0075 100644
|
||||
--- a/lib/matplotlib/backends/backend_pdf.py
|
||||
+++ b/lib/matplotlib/backends/backend_pdf.py
|
||||
@@ -1646,8 +1646,19 @@ end"""
|
||||
# Convert to indexed color if there are 256 colors or fewer
|
||||
# This can significantly reduce the file size
|
||||
num_colors = len(img_colors)
|
||||
- img = img.convert(mode='P', dither=Image.NONE,
|
||||
- palette=Image.ADAPTIVE, colors=num_colors)
|
||||
+ # These constants were converted to IntEnums and deprecated in
|
||||
+ # Pillow 9.2
|
||||
+ dither = (
|
||||
+ Image.Dither.NONE if hasattr(Image, 'Dither')
|
||||
+ else Image.NONE
|
||||
+ )
|
||||
+ pmode = (
|
||||
+ Image.Palette.ADAPTIVE if hasattr(Image, 'Palette')
|
||||
+ else Image.ADAPTIVE
|
||||
+ )
|
||||
+ img = img.convert(
|
||||
+ mode='P', dither=dither, palette=pmode, colors=num_colors
|
||||
+ )
|
||||
png_data, bit_depth, palette = self._writePng(img)
|
||||
if bit_depth is None or palette is None:
|
||||
raise RuntimeError("invalid PNG header")
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -1,54 +1,28 @@
|
||||
From 7d34e4c6cf3e9f0b68d0a7f70f5c832a24b74d7e Mon Sep 17 00:00:00 2001
|
||||
From 60ab4094d885067c50694d2f11cd640dc5c0f0c6 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Wed, 27 Sep 2017 19:35:59 -0400
|
||||
Subject: [PATCH 1/2] matplotlibrc path search fix
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/__init__.py | 28 ++++------------------------
|
||||
1 file changed, 4 insertions(+), 24 deletions(-)
|
||||
lib/matplotlib/__init__.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 1c47973f15..202acce525 100644
|
||||
index 71c68a3d6b..88be8e97b0 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -536,33 +536,11 @@ def get_data_path(*, _from_rc=None):
|
||||
|
||||
@_logged_cached('(private) matplotlib data path: %s')
|
||||
def _get_data_path():
|
||||
- path = Path(__file__).with_name("mpl-data")
|
||||
+ path = (Path(__file__).parent.parent.parent.parent.parent /
|
||||
+ 'share/matplotlib/mpl-data')
|
||||
if path.is_dir():
|
||||
return str(path)
|
||||
|
||||
- cbook.warn_deprecated(
|
||||
- "3.2", message="Matplotlib installs where the data is not in the "
|
||||
- "mpl-data subdirectory of the package are deprecated since %(since)s "
|
||||
- "and support for them will be removed %(removal)s.")
|
||||
-
|
||||
- def get_candidate_paths():
|
||||
- # setuptools' namespace_packages may hijack this init file
|
||||
- # so need to try something known to be in Matplotlib, not basemap.
|
||||
- import matplotlib.afm
|
||||
- yield Path(matplotlib.afm.__file__).with_name('mpl-data')
|
||||
- # py2exe zips pure python, so still need special check.
|
||||
- if getattr(sys, 'frozen', None):
|
||||
- yield Path(sys.executable).with_name('mpl-data')
|
||||
- # Try again assuming we need to step up one more directory.
|
||||
- yield Path(sys.executable).parent.with_name('mpl-data')
|
||||
- # Try again assuming sys.path[0] is a dir not a exe.
|
||||
- yield Path(sys.path[0]) / 'mpl-data'
|
||||
-
|
||||
- for path in get_candidate_paths():
|
||||
- if path.is_dir():
|
||||
- defaultParams['datapath'][0] = str(path)
|
||||
- return str(path)
|
||||
-
|
||||
raise RuntimeError('Could not find the matplotlib data files')
|
||||
@@ -473,7 +473,8 @@ def get_cachedir():
|
||||
@_logged_cached('matplotlib data path: %s')
|
||||
def get_data_path():
|
||||
"""Return the path to Matplotlib data."""
|
||||
- return str(Path(__file__).with_name("mpl-data"))
|
||||
+ return str(Path(__file__).parent.parent.parent.parent.parent /
|
||||
+ 'share/matplotlib/mpl-data')
|
||||
|
||||
|
||||
@@ -583,6 +561,7 @@ def matplotlib_fname():
|
||||
def matplotlib_fname():
|
||||
@@ -493,6 +494,7 @@ def matplotlib_fname():
|
||||
is not defined)
|
||||
- On other platforms,
|
||||
- ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
|
||||
@@ -56,14 +30,14 @@ index 1c47973f15..202acce525 100644
|
||||
- Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
|
||||
exist.
|
||||
"""
|
||||
@@ -597,6 +576,7 @@ def matplotlib_fname():
|
||||
@@ -511,6 +513,7 @@ def matplotlib_fname():
|
||||
yield matplotlibrc
|
||||
yield os.path.join(matplotlibrc, 'matplotlibrc')
|
||||
yield os.path.join(get_configdir(), 'matplotlibrc')
|
||||
+ yield '/etc/matplotlibrc'
|
||||
yield os.path.join(_get_data_path(), 'matplotlibrc')
|
||||
yield os.path.join(get_data_path(), 'matplotlibrc')
|
||||
|
||||
for fname in gen_candidates():
|
||||
--
|
||||
2.29.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 40ed55c16c0d3f7d2365af5c6a8f99e02eadae31 Mon Sep 17 00:00:00 2001
|
||||
From 7ca8afa7fa3e141464c1ef2b2c58b23b586bf310 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Fri, 14 Feb 2020 06:05:42 -0500
|
||||
Subject: [PATCH 2/2] Set FreeType version to 2.10.4 and update tolerances.
|
||||
@@ -8,16 +8,17 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
lib/matplotlib/__init__.py | 2 +-
|
||||
lib/matplotlib/tests/test_axes.py | 4 ++--
|
||||
lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
|
||||
lib/matplotlib/tests/test_mathtext.py | 7 +++++--
|
||||
lib/matplotlib/tests/test_polar.py | 2 +-
|
||||
lib/matplotlib/tests/test_tightlayout.py | 10 +++++-----
|
||||
setupext.py | 6 +++++-
|
||||
6 files changed, 15 insertions(+), 11 deletions(-)
|
||||
setupext.py | 9 ++++++++-
|
||||
7 files changed, 23 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 202acce525..18731b7c4d 100644
|
||||
index 88be8e97b0..22dc74181e 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1198,7 +1198,7 @@ default_test_modules = [
|
||||
@@ -1137,7 +1137,7 @@ default_test_modules = [
|
||||
def _init_tests():
|
||||
# The version of FreeType to install locally for running the
|
||||
# tests. This must match the value in `setupext.py`
|
||||
@@ -27,10 +28,10 @@ index 202acce525..18731b7c4d 100644
|
||||
from matplotlib import ft2font
|
||||
if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
|
||||
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
|
||||
index e0b340da1e..9090c2930c 100644
|
||||
index 7950e5b830..046dbbe1b8 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -6055,7 +6055,7 @@ def test_normal_axes():
|
||||
@@ -6500,7 +6500,7 @@ def test_normal_axes():
|
||||
]
|
||||
for nn, b in enumerate(bbaxis):
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
|
||||
@@ -39,7 +40,7 @@ index e0b340da1e..9090c2930c 100644
|
||||
|
||||
target = [
|
||||
[150.0, 119.999, 930.0, 11.111],
|
||||
@@ -6073,7 +6073,7 @@ def test_normal_axes():
|
||||
@@ -6518,7 +6518,7 @@ def test_normal_axes():
|
||||
|
||||
target = [85.5138, 75.88888, 1021.11, 1017.11]
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target)
|
||||
@@ -49,20 +50,54 @@ index e0b340da1e..9090c2930c 100644
|
||||
# test that get_position roundtrips to get_window_extent
|
||||
axbb = ax.get_position().transformed(fig.transFigure).bounds
|
||||
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
index 46e6b9663e..593b3fb3ee 100644
|
||||
index 117b221cc2..d009912dfa 100644
|
||||
--- a/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
@@ -398,4 +398,4 @@ def test_hidden_axes():
|
||||
@@ -429,7 +429,7 @@ def test_hidden_axes():
|
||||
extents1 = np.copy(axs[0, 0].get_position().extents)
|
||||
|
||||
np.testing.assert_allclose(
|
||||
- extents1, [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-5)
|
||||
+ extents1, [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-2)
|
||||
- extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5)
|
||||
+ extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2)
|
||||
|
||||
|
||||
def test_colorbar_align():
|
||||
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
|
||||
index b5fd906d2f..8e3801a231 100644
|
||||
--- a/lib/matplotlib/tests/test_mathtext.py
|
||||
+++ b/lib/matplotlib/tests/test_mathtext.py
|
||||
@@ -1,5 +1,6 @@
|
||||
import io
|
||||
import os
|
||||
+import platform
|
||||
import re
|
||||
|
||||
import numpy as np
|
||||
@@ -189,7 +190,8 @@ def baseline_images(request, fontset, index, text):
|
||||
@pytest.mark.parametrize(
|
||||
'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
|
||||
@pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
|
||||
-@image_comparison(baseline_images=None)
|
||||
+@image_comparison(baseline_images=None,
|
||||
+ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
|
||||
def test_mathtext_rendering(baseline_images, fontset, index, text):
|
||||
mpl.rcParams['mathtext.fontset'] = fontset
|
||||
fig = plt.figure(figsize=(5.25, 0.75))
|
||||
@@ -213,7 +215,8 @@ def test_mathtext_rendering_lightweight(baseline_images, fontset, index, text):
|
||||
@pytest.mark.parametrize(
|
||||
'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
|
||||
@pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
|
||||
-@image_comparison(baseline_images=None, extensions=['png'])
|
||||
+@image_comparison(baseline_images=None, extensions=['png'],
|
||||
+ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
|
||||
def test_mathfont_rendering(baseline_images, fontset, index, text):
|
||||
mpl.rcParams['mathtext.fontset'] = fontset
|
||||
fig = plt.figure(figsize=(5.25, 0.75))
|
||||
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
|
||||
index da9a77c825..a7a98ef59e 100644
|
||||
index c614eff027..daf4e26fb8 100644
|
||||
--- a/lib/matplotlib/tests/test_polar.py
|
||||
+++ b/lib/matplotlib/tests/test_polar.py
|
||||
@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
|
||||
@@ -312,7 +312,7 @@ def test_get_tightbbox_polar():
|
||||
fig.canvas.draw()
|
||||
bb = ax.get_tightbbox(fig.canvas.get_renderer())
|
||||
assert_allclose(
|
||||
@@ -72,10 +107,10 @@ index da9a77c825..a7a98ef59e 100644
|
||||
|
||||
@check_figures_equal(extensions=["png"])
|
||||
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
|
||||
index 9ad2e0a9a0..7c9085a314 100644
|
||||
index 23d363b508..e94c863477 100644
|
||||
--- a/lib/matplotlib/tests/test_tightlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_tightlayout.py
|
||||
@@ -171,12 +171,12 @@ def test_outward_ticks():
|
||||
@@ -172,12 +172,12 @@ def test_outward_ticks():
|
||||
plt.tight_layout()
|
||||
# These values were obtained after visual checking that they correspond
|
||||
# to a tight layouting that did take the ticks into account.
|
||||
@@ -94,10 +129,10 @@ index 9ad2e0a9a0..7c9085a314 100644
|
||||
|
||||
|
||||
diff --git a/setupext.py b/setupext.py
|
||||
index dfa004d7f0..8ec77feed9 100644
|
||||
index d8d0b6b393..e44d3b046a 100644
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -129,12 +129,16 @@ _freetype_hashes = {
|
||||
@@ -167,12 +167,18 @@ _freetype_hashes = {
|
||||
'955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
|
||||
'2.10.1':
|
||||
'3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
|
||||
@@ -105,6 +140,8 @@ index dfa004d7f0..8ec77feed9 100644
|
||||
+ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
|
||||
+ '2.10.4':
|
||||
+ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
|
||||
+ '2.11.0':
|
||||
+ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
|
||||
}
|
||||
# This is the version of FreeType to use when building a local
|
||||
# version. It must match the value in
|
||||
@@ -114,7 +151,15 @@ index dfa004d7f0..8ec77feed9 100644
|
||||
+LOCAL_FREETYPE_VERSION = '2.10.4'
|
||||
LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
|
||||
|
||||
LOCAL_QHULL_VERSION = '2020.2'
|
||||
@@ -565,6 +571,7 @@ class FreeType(SetupPackage):
|
||||
ext.extra_objects.insert(
|
||||
0, str(src_path / 'objs' / '.libs' / libfreetype))
|
||||
ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
|
||||
+ ext.libraries.append('brotlidec')
|
||||
|
||||
def do_custom_build(self, env):
|
||||
# We're using a system freetype
|
||||
--
|
||||
2.29.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@@ -10,6 +10,13 @@
|
||||
%bcond_without qt4
|
||||
%endif
|
||||
|
||||
# No WX for EL8
|
||||
%if 0%{?rhel} == 8
|
||||
%bcond_with wx
|
||||
%else
|
||||
%bcond_without wx
|
||||
%endif
|
||||
|
||||
# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
|
||||
# WXAgg Agg Cairo PS PDF SVG
|
||||
%global backend TkAgg
|
||||
@@ -34,15 +41,15 @@
|
||||
%global _docdir_fmt %{name}
|
||||
|
||||
# Updated test images for new FreeType.
|
||||
%global mpl_images_version 3.3.3
|
||||
%global mpl_images_version 3.4.3
|
||||
|
||||
# The version of FreeType in this Fedora branch.
|
||||
%global ftver 2.10.4
|
||||
|
||||
Name: python-matplotlib
|
||||
Version: 3.3.4
|
||||
%global Version 3.3.4
|
||||
Release: 1%{?dist}
|
||||
Version: 3.4.3
|
||||
%global Version 3.4.3
|
||||
Release: 4%{?dist}
|
||||
Summary: Python 2D plotting library
|
||||
# qt4_editor backend is MIT
|
||||
# ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is Public Domain
|
||||
@@ -51,6 +58,10 @@ URL: http://matplotlib.org
|
||||
Source0: https://github.com/matplotlib/matplotlib/archive/v%{Version}/matplotlib-%{Version}.tar.gz
|
||||
Source1: setup.cfg
|
||||
|
||||
# Upstream backported patches
|
||||
# https://github.com/matplotlib/matplotlib/commit/bb997708c08dae01ac95104f1f33d8c08c4715d4
|
||||
Patch1: 0001-FIX-account-for-constant-deprecations-in-Pillow-9.1.patch
|
||||
|
||||
# Fedora-specific patches; see:
|
||||
# https://github.com/fedora-python/matplotlib/tree/fedora-patches
|
||||
# Updated test images for new FreeType.
|
||||
@@ -70,13 +81,21 @@ BuildRequires: xorg-x11-server-Xvfb
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
BuildRequires: ghostscript
|
||||
# No ImageMagick for EL8/ELN/EL9
|
||||
%if ! 0%{?rhel} >= 8
|
||||
BuildRequires: ImageMagick
|
||||
%endif
|
||||
%ifnarch s390x
|
||||
BuildRequires: inkscape
|
||||
%endif
|
||||
|
||||
BuildRequires: texlive-collection-basic
|
||||
BuildRequires: texlive-collection-fontsrecommended
|
||||
BuildRequires: texlive-collection-latex
|
||||
BuildRequires: texlive-collection-latexrecommended
|
||||
BuildRequires: texlive-dvipng
|
||||
BuildRequires: texlive-latex-bin
|
||||
BuildRequires: texlive-luahbtex
|
||||
BuildRequires: texlive-tex-bin
|
||||
BuildRequires: texlive-xetex-bin
|
||||
# Search for documentclass and add the classes here.
|
||||
@@ -94,6 +113,7 @@ BuildRequires: tex(charter.sty)
|
||||
BuildRequires: tex(color.sty)
|
||||
BuildRequires: tex(courier.sty)
|
||||
BuildRequires: tex(euler.sty)
|
||||
BuildRequires: tex(fancyhdr.sty)
|
||||
BuildRequires: tex(fontenc.sty)
|
||||
BuildRequires: tex(fontspec.sty)
|
||||
BuildRequires: tex(geometry.sty)
|
||||
@@ -216,6 +236,11 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
Requires: python3-matplotlib-qt5
|
||||
Requires: python3-PyQt4
|
||||
|
||||
# Upstream has deprecated this backend due to Qt4 being no longer supported.
|
||||
# This backend will be removed when upstream does, likely in 3.5, or Fedora 35.
|
||||
# The removal date is thus estimated to be the Fedora 35 Branch point.
|
||||
Provides: deprecated() = 20210810
|
||||
|
||||
%description -n python3-matplotlib-qt4
|
||||
%{summary}
|
||||
%endif
|
||||
@@ -251,6 +276,7 @@ Requires: python3-tkinter
|
||||
%description -n python3-matplotlib-tk
|
||||
%{summary}
|
||||
|
||||
%if %{with wx}
|
||||
%package -n python3-matplotlib-wx
|
||||
Summary: WX backend for python3-matplotlib
|
||||
BuildRequires: python3-wxpython4
|
||||
@@ -259,6 +285,7 @@ Requires: python3-wxpython4
|
||||
|
||||
%description -n python3-matplotlib-wx
|
||||
%{summary}
|
||||
%endif
|
||||
|
||||
%package -n python3-matplotlib-doc
|
||||
Summary: Documentation files for python-matplotlib
|
||||
@@ -289,12 +316,14 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
%prep
|
||||
%autosetup -n matplotlib-%{Version} -N
|
||||
|
||||
# Upstream backported patches
|
||||
%patch1 -p1
|
||||
|
||||
# Fedora-specific patches follow:
|
||||
%patch1001 -p1
|
||||
# Updated test images for new FreeType.
|
||||
%patch1002 -p1
|
||||
gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
|
||||
rm -r extern/libqhull
|
||||
|
||||
# Copy setup.cfg to the builddir
|
||||
cp -p %{SOURCE1} setup.cfg
|
||||
@@ -322,6 +351,13 @@ find examples -name '*.py' -exec chmod a-x '{}' \;
|
||||
export http_proxy=http://127.0.0.1/
|
||||
|
||||
MPLCONFIGDIR=$PWD %py3_install
|
||||
|
||||
# Delete unnecessary files.
|
||||
rm %{buildroot}%{python3_sitearch}/matplotlib/backends/web_backend/.{eslintrc.js,prettierignore,prettierrc}
|
||||
rm %{buildroot}%{python3_sitearch}/matplotlib/tests/tinypages/.gitignore
|
||||
rm %{buildroot}%{python3_sitearch}/matplotlib/tests/tinypages/_static/.gitignore
|
||||
|
||||
# Move files to Fedora-specific locations.
|
||||
mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
|
||||
mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \
|
||||
%{buildroot}%{_datadir}/matplotlib
|
||||
@@ -337,6 +373,7 @@ rm -rf build*/
|
||||
|
||||
# We need to prime this LaTeX cache stuff, or it might fail while running tests
|
||||
# in parallel.
|
||||
mktexfmt latex.fmt
|
||||
mktexfmt lualatex.fmt
|
||||
mktexfmt pdflatex.fmt
|
||||
mktexfmt xelatex.fmt
|
||||
@@ -426,11 +463,45 @@ PYTHONDONTWRITEBYTECODE=1 \
|
||||
%pycached %{python3_sitearch}/matplotlib/backends/_backend_tk.py
|
||||
%{python3_sitearch}/matplotlib/backends/_tkagg.*
|
||||
|
||||
%if %{with wx}
|
||||
%files -n python3-matplotlib-wx
|
||||
%pycached %{python3_sitearch}/matplotlib/backends/backend_wx*.py
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Jul 16 2023 Orion Poplawski <orion@nwra.com> - 3.4.3-4
|
||||
- Re-enable wx support (bz#2211203)
|
||||
|
||||
* Sat Apr 15 2023 Carl George <carl@george.computer> - 3.4.3-3
|
||||
- Fix compatibility with Pillow 9.1
|
||||
|
||||
* Wed Aug 25 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.3-2
|
||||
- Fix return type in get_data_path patch
|
||||
|
||||
* Fri Aug 13 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.3-1
|
||||
- Update to latest version (#1993426)
|
||||
|
||||
* Sat May 08 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.2-1
|
||||
- Update to latest version (#1958461)
|
||||
|
||||
* Wed Mar 31 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.1-1
|
||||
- Update to latest version (#1943482)
|
||||
|
||||
* Thu Mar 11 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc3-1
|
||||
- Update to latest release candidate
|
||||
|
||||
* Fri Feb 19 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc1-1
|
||||
- Update to latest release candidate
|
||||
- Deprecated python3-matplotlib-qt4 subpackage
|
||||
|
||||
* Tue Feb 16 2021 Troy Dawson <tdawson@redhat.com> - 3.3.4-3
|
||||
- Add build deps that were only getting pulled in by other dependencies
|
||||
|
||||
* Mon Feb 01 2021 Tomas Popela <tpopela@redhat.com> - 3.3.4-2
|
||||
- Conditionalize the WX backend and disable it on RHEL 8+ as WX is not
|
||||
available there.
|
||||
|
||||
* Thu Jan 28 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.4-1
|
||||
- Update to latest version (#1921574)
|
||||
|
||||
|
||||
4
sources
4
sources
@@ -1,2 +1,2 @@
|
||||
SHA512 (matplotlib-3.3.4.tar.gz) = e29bcd17ea2b65c26c75421a319d3f21c5b0148c9e61d55d719c191c07342ed19032f97cde269647bd545ed45b5e142483e50caf29ffd421acde5b0b3bfa238b
|
||||
SHA512 (matplotlib-3.3.3-with-freetype-2.10.4.tar.gz) = b583842a24edc5deb39a3182797199081500fb089bff467a9e55d3612d8c049d43ed08385d42060271928f5cb02240599c7173a65c213fae9bafb2081c54c5a1
|
||||
SHA512 (matplotlib-3.4.3.tar.gz) = e346c7d0f33b7d2fb5b48a4578ec99a40c2e5b959d109526ccbe7582a37f10abb91d53062711c37eb4ccaf462fd8684e1557405c50ccf43139bc371601a60e80
|
||||
SHA512 (matplotlib-3.4.3-with-freetype-2.10.4.tar.gz) = 665870e9c34fa562c69c28432b6d378e02c63ff2b14a34f982a16c89ecdb3b012cdf3306e84a052d689710f2ddff069c8a207b63971c73e5c867d6562e1f6241
|
||||
|
||||
Reference in New Issue
Block a user