Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
456f5ae5e9 | ||
|
|
ef6d83f8cb | ||
|
|
bf7f2e8c26 | ||
|
|
4a9aa8cc5f | ||
|
|
67cfdf16e6 | ||
|
|
babfa71d28 | ||
|
|
fb6bd19e9a | ||
|
|
3b30af1392 | ||
|
|
15ef8e9ff8 | ||
|
|
7c6d477c42 | ||
|
|
53105ce245 | ||
|
|
9ded60e8c1 | ||
|
|
2c247d43e1 | ||
|
|
72dc76a446 | ||
|
|
42d4911499 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -119,3 +119,7 @@ matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/matplotlib-3.10.0-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.10.3.tar.gz
|
||||
/matplotlib-3.10.3-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.10.5.tar.gz
|
||||
/matplotlib-3.10.6.tar.gz
|
||||
/matplotlib-3.10.8.tar.gz
|
||||
/matplotlib-3.10.8-with-freetype-2.14.1.tar.gz
|
||||
|
||||
@@ -1,28 +1,18 @@
|
||||
From 37007fd04ff67cf7c766aa6cd4fa9e564841cb17 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
From 50c46d80a99b6bdbb61733b0eef69649f22701ab Mon Sep 17 00:00:00 2001
|
||||
From: Sandro Tosi <morph@debian.org>
|
||||
Date: Wed, 27 Sep 2017 19:35:59 -0400
|
||||
Subject: [PATCH 1/5] matplotlibrc path search fix
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/__init__.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
lib/matplotlib/__init__.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 5f964e0b34..f82d92466a 100644
|
||||
index 2786f9b7b9..79cccf0892 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -590,7 +590,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')
|
||||
|
||||
|
||||
def matplotlib_fname():
|
||||
@@ -610,6 +611,7 @@ def matplotlib_fname():
|
||||
@@ -613,6 +613,7 @@ def matplotlib_fname():
|
||||
is not defined)
|
||||
- On other platforms,
|
||||
- ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
|
||||
@@ -30,7 +20,7 @@ index 5f964e0b34..f82d92466a 100644
|
||||
- Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
|
||||
exist.
|
||||
"""
|
||||
@@ -628,6 +630,7 @@ def matplotlib_fname():
|
||||
@@ -631,6 +632,7 @@ def matplotlib_fname():
|
||||
yield matplotlibrc
|
||||
yield os.path.join(matplotlibrc, 'matplotlibrc')
|
||||
yield os.path.join(get_configdir(), 'matplotlibrc')
|
||||
@@ -39,5 +29,5 @@ index 5f964e0b34..f82d92466a 100644
|
||||
|
||||
for fname in gen_candidates():
|
||||
--
|
||||
2.49.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 944d5021f46735045a69af1e57ff0bb0c43e7fbb Mon Sep 17 00:00:00 2001
|
||||
From 4550b06f9de6c23d7b87a34d2bca1c9aaa594a3e 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/5] Set FreeType version to 2.13.1 and update tolerances
|
||||
Subject: [PATCH 2/5] Set FreeType version to 2.14.1 and update tolerances
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
@@ -15,7 +15,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
7 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/extern/meson.build b/extern/meson.build
|
||||
index 5463183a90..c7233815af 100644
|
||||
index 5463183a90..928eb6bd56 100644
|
||||
--- a/extern/meson.build
|
||||
+++ b/extern/meson.build
|
||||
@@ -13,7 +13,7 @@ else
|
||||
@@ -23,28 +23,28 @@ index 5463183a90..c7233815af 100644
|
||||
# in `docs/devel/dependencies.rst`. Bump the cache key in
|
||||
# `.circleci/config.yml` when changing requirements.
|
||||
- LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.13.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.14.1'
|
||||
|
||||
freetype_proj = subproject(
|
||||
f'freetype-@LOCAL_FREETYPE_VERSION@',
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index f82d92466a..c0551b5b5f 100644
|
||||
index 79cccf0892..04d716b54c 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1361,7 +1361,7 @@ def _val_or_rc(val, rc_name):
|
||||
@@ -1363,7 +1363,7 @@ def _val_or_rc(val, rc_name):
|
||||
def _init_tests():
|
||||
# The version of FreeType to install locally for running the tests. This must match
|
||||
# the value in `meson.build`.
|
||||
- LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.13.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.14.1'
|
||||
|
||||
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 e3fc1ada99..28870ea736 100644
|
||||
index 159fc70282..b304186fc9 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -8065,7 +8065,7 @@ def test_normal_axes():
|
||||
@@ -8084,7 +8084,7 @@ def test_normal_axes():
|
||||
]
|
||||
for nn, b in enumerate(bbaxis):
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
|
||||
@@ -53,7 +53,7 @@ index e3fc1ada99..28870ea736 100644
|
||||
|
||||
target = [
|
||||
[150.0, 119.999, 930.0, 11.111],
|
||||
@@ -8083,7 +8083,7 @@ def test_normal_axes():
|
||||
@@ -8102,7 +8102,7 @@ def test_normal_axes():
|
||||
|
||||
target = [85.5138, 75.88888, 1021.11, 1017.11]
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target)
|
||||
@@ -94,10 +94,10 @@ index 6ba23bab34..0aee3222f1 100644
|
||||
])
|
||||
def test_ft2font_get_kerning(left, right, unscaled, unfitted, default):
|
||||
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
|
||||
index 5e69044866..0b6413e97f 100644
|
||||
index eb3bfca7c2..c01be3aec0 100644
|
||||
--- a/lib/matplotlib/tests/test_legend.py
|
||||
+++ b/lib/matplotlib/tests/test_legend.py
|
||||
@@ -508,9 +508,9 @@ def test_figure_legend_outside():
|
||||
@@ -520,9 +520,9 @@ def test_figure_legend_outside():
|
||||
fig.draw_without_rendering()
|
||||
|
||||
assert_allclose(axs.get_window_extent().extents,
|
||||
@@ -110,7 +110,7 @@ index 5e69044866..0b6413e97f 100644
|
||||
|
||||
@image_comparison(['legend_stackplot.png'],
|
||||
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
|
||||
index 87c8efe304..af5f2d2c6a 100644
|
||||
index 844ab8cf3a..826a8a0c3a 100644
|
||||
--- a/lib/matplotlib/tests/test_polar.py
|
||||
+++ b/lib/matplotlib/tests/test_polar.py
|
||||
@@ -328,7 +328,7 @@ def test_get_tightbbox_polar():
|
||||
@@ -123,5 +123,5 @@ index 87c8efe304..af5f2d2c6a 100644
|
||||
|
||||
@check_figures_equal(extensions=["png"])
|
||||
--
|
||||
2.49.0
|
||||
2.52.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 814405dd99896a362bdd18b42e591d6594e59dcf Mon Sep 17 00:00:00 2001
|
||||
From ff0a79b707eb6603c0cb0bd3778c3c88fbacfac8 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Fri, 13 Dec 2024 02:03:33 -0500
|
||||
Subject: [PATCH 3/5] Unpin meson-python build requirement
|
||||
@@ -12,10 +12,10 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index e6d1abaf53..76755eec25 100644
|
||||
index 23c441b52c..f762c85d98 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -47,7 +47,7 @@ requires-python = ">=3.10"
|
||||
@@ -48,7 +48,7 @@ requires-python = ">=3.10"
|
||||
[project.optional-dependencies]
|
||||
# Should be a copy of the build dependencies below.
|
||||
dev = [
|
||||
@@ -24,7 +24,7 @@ index e6d1abaf53..76755eec25 100644
|
||||
"pybind11>=2.13.2,!=2.13.3",
|
||||
"setuptools_scm>=7",
|
||||
# Not required by us but setuptools_scm without a version, cso _if_
|
||||
@@ -71,7 +71,7 @@ dev = [
|
||||
@@ -72,7 +72,7 @@ dev = [
|
||||
build-backend = "mesonpy"
|
||||
# Also keep in sync with optional dependencies above.
|
||||
requires = [
|
||||
@@ -34,5 +34,5 @@ index e6d1abaf53..76755eec25 100644
|
||||
"setuptools_scm>=7",
|
||||
]
|
||||
--
|
||||
2.49.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 97f398b19278f450ffdcecf8443489ec981321a4 Mon Sep 17 00:00:00 2001
|
||||
From abf5f01b8fa262c71f7ccdf189c608f189028a44 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 22 Aug 2022 18:43:28 -0400
|
||||
Subject: [PATCH 4/5] Use old stride_windows implementation on 32-bit x86
|
||||
@@ -80,5 +80,5 @@ index 8326ac186e..bdaa34b734 100644
|
||||
resultY = resultY * window.reshape((-1, 1))
|
||||
resultY = np.fft.fft(resultY, n=pad_to, axis=0)[:numFreqs, :]
|
||||
--
|
||||
2.49.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 236b1b8164088b2b9ac85b5d83e9d6cf41269935 Mon Sep 17 00:00:00 2001
|
||||
From 7a5bbfe3bd5905a7daefac690ebdfd7403c8ef7a Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Tue, 12 Nov 2024 01:05:25 -0500
|
||||
Subject: [PATCH 5/5] Partially revert "TST: Fix minor issues in interactive
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
|
||||
index 063c72e2cd..5dd53440f7 100644
|
||||
index 4e3c1bbc2b..903ae87cbb 100644
|
||||
--- a/lib/matplotlib/tests/test_backends_interactive.py
|
||||
+++ b/lib/matplotlib/tests/test_backends_interactive.py
|
||||
@@ -232,7 +232,10 @@ def _test_interactive_impl():
|
||||
@@ -28,5 +28,5 @@ index 063c72e2cd..5dd53440f7 100644
|
||||
|
||||
@pytest.mark.parametrize("env", _get_testable_interactive_backends())
|
||||
--
|
||||
2.49.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
%global _docdir_fmt %{name}
|
||||
|
||||
# Updated test images for new FreeType.
|
||||
%global mpl_images_version 3.10.3
|
||||
%global mpl_images_version 3.10.8
|
||||
|
||||
# The version of FreeType in this Fedora branch.
|
||||
%global ftver 2.13.1
|
||||
%global ftver 2.14.1
|
||||
|
||||
Name: python-matplotlib
|
||||
Version: 3.10.3
|
||||
Version: 3.10.8
|
||||
%global Version %{version_no_tilde %{quote:%nil}}
|
||||
Release: %autorelease
|
||||
Summary: Python 2D plotting library
|
||||
@@ -71,20 +71,25 @@ BuildRequires: glibc-langpack-en
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: qhull-devel
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: xwayland-run
|
||||
%endif
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: ghostscript
|
||||
# No ImageMagick for EL8/ELN/EL9
|
||||
%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} < 8)
|
||||
BuildRequires: ImageMagick
|
||||
%endif
|
||||
BuildRequires: inkscape
|
||||
%endif
|
||||
|
||||
BuildRequires: font(dejavusans)
|
||||
BuildRequires: font(notosanscjkjp)
|
||||
BuildRequires: font(wenquanyizenhei)
|
||||
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: texlive-collection-basic
|
||||
BuildRequires: texlive-collection-fontsrecommended
|
||||
BuildRequires: texlive-collection-latex
|
||||
@@ -133,6 +138,7 @@ BuildRequires: tex(cmr10.tfm)
|
||||
BuildRequires: tex(cmss10.tfm)
|
||||
BuildRequires: tex(cmsy10.tfm)
|
||||
BuildRequires: tex(cmtt10.tfm)
|
||||
%endif
|
||||
|
||||
%description
|
||||
Matplotlib is a Python 2D plotting library which produces publication
|
||||
@@ -145,25 +151,17 @@ Matplotlib tries to make easy things easy and hard things possible.
|
||||
You can generate plots, histograms, power spectra, bar charts,
|
||||
errorcharts, scatterplots, etc, with just a few lines of code.
|
||||
|
||||
%package -n python3-matplotlib-data
|
||||
Summary: Data used by python-matplotlib
|
||||
BuildArch: noarch
|
||||
%if %{with bundled_fonts}
|
||||
Requires: python3-matplotlib-data-fonts = %{version}-%{release}
|
||||
%endif
|
||||
Obsoletes: python-matplotlib-data < 3
|
||||
|
||||
%description -n python3-matplotlib-data
|
||||
%{summary}
|
||||
|
||||
%if %{with bundled_fonts}
|
||||
%package -n python3-matplotlib-data-fonts
|
||||
Summary: Fonts used by python-matplotlib
|
||||
# Carlogo, STIX and Computer Modern is OFL
|
||||
# DejaVu is Bitstream Vera and Public Domain
|
||||
License: OFL-1.1 AND Bitstream-Vera AND LicenseRef-Fedora-Public-Domain
|
||||
BuildArch: noarch
|
||||
Requires: python3-matplotlib-data = %{version}-%{release}
|
||||
%if %{without bundled_fonts}
|
||||
Requires: stix-math-fonts
|
||||
%else
|
||||
Provides: bundled(stix-math-fonts)
|
||||
%endif
|
||||
Obsoletes: python-matplotlib-data-fonts < 3
|
||||
|
||||
%description -n python3-matplotlib-data-fonts
|
||||
@@ -173,13 +171,15 @@ Obsoletes: python-matplotlib-data-fonts < 3
|
||||
%package -n python3-matplotlib
|
||||
Summary: Python 2D plotting library
|
||||
BuildRequires: python3-devel
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: python3dist(pycairo)
|
||||
%endif
|
||||
BuildRequires: python3dist(pytz)
|
||||
BuildRequires: python3dist(sphinx)
|
||||
Requires: dejavu-sans-fonts
|
||||
Recommends: texlive-dvipng
|
||||
Requires: (texlive-dvipng if texlive-base)
|
||||
Requires: python3-matplotlib-data = %{version}-%{release}
|
||||
Requires: python3-matplotlib-data-fonts = %{version}-%{release}
|
||||
Requires: python3dist(pycairo)
|
||||
Recommends: python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
|
||||
%if %{with check}
|
||||
@@ -187,13 +187,14 @@ BuildRequires: python3dist(pytest)
|
||||
BuildRequires: python3dist(pytest-rerunfailures)
|
||||
BuildRequires: python3dist(pytest-timeout)
|
||||
BuildRequires: python3dist(pytest-xdist)
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: python3dist(pikepdf)
|
||||
%endif
|
||||
%if %{without bundled_fonts}
|
||||
Requires: stix-math-fonts
|
||||
%else
|
||||
Provides: bundled(stix-math-fonts)
|
||||
%endif
|
||||
# Remove in F45.
|
||||
Provides: python3-matplotlib-data = %{version}-%{release}
|
||||
Obsoletes: python3-matplotlib-data < 3.11~~~
|
||||
Obsoletes: python-matplotlib-data < 3
|
||||
|
||||
%description -n python3-matplotlib
|
||||
Matplotlib is a Python 2D plotting library which produces publication
|
||||
@@ -209,8 +210,10 @@ errorcharts, scatterplots, etc, with just a few lines of code.
|
||||
%package -n python3-matplotlib-qt5
|
||||
Summary: Qt5 backend for python3-matplotlib
|
||||
BuildRequires: python3dist(cairocffi)
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: python3dist(pyqt5)
|
||||
BuildRequires: qt5-qtwayland
|
||||
%endif
|
||||
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
Requires: python3dist(cairocffi)
|
||||
Requires: python3dist(pyqt5)
|
||||
@@ -222,9 +225,11 @@ Obsoletes: python3-matplotlib-qt4 < 3.5.0-0
|
||||
%package -n python3-matplotlib-qt6
|
||||
Summary: Qt6 backend for python3-matplotlib
|
||||
BuildRequires: python3dist(cairocffi)
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: python3dist(pyqt6)
|
||||
BuildRequires: python3-pyqt6
|
||||
BuildRequires: qt6-qtwayland
|
||||
%endif
|
||||
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
Requires: python3dist(cairocffi)
|
||||
Requires: python3dist(pyqt6)
|
||||
@@ -234,9 +239,15 @@ Requires: python3dist(pyqt6)
|
||||
|
||||
%package -n python3-matplotlib-gtk3
|
||||
Summary: GTK3 backend for python3-matplotlib
|
||||
%ifnarch %{ix86}
|
||||
# For Cairo and xlib typelib files.
|
||||
BuildRequires: gobject-introspection
|
||||
# This should be converted to typelib(Gtk) when supported
|
||||
BuildRequires: gtk3
|
||||
BuildRequires: python3-gobject
|
||||
%endif
|
||||
# For Cairo and xlib typelib files.
|
||||
Requires: gobject-introspection
|
||||
Requires: gtk3%{?_isa}
|
||||
Requires: python3-gobject%{?_isa}
|
||||
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
@@ -246,9 +257,15 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
|
||||
%package -n python3-matplotlib-gtk4
|
||||
Summary: GTK4 backend for python3-matplotlib
|
||||
%ifnarch %{ix86}
|
||||
# For Cairo and xlib typelib files.
|
||||
BuildRequires: gobject-introspection
|
||||
# This should be converted to typelib(Gtk) when supported
|
||||
BuildRequires: gtk4
|
||||
BuildRequires: python3-gobject
|
||||
%endif
|
||||
# For Cairo and xlib typelib files.
|
||||
Requires: gobject-introspection
|
||||
Requires: gtk4%{?_isa}
|
||||
Requires: python3-gobject%{?_isa}
|
||||
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
@@ -258,8 +275,10 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
|
||||
%package -n python3-matplotlib-tk
|
||||
Summary: Tk backend for python3-matplotlib
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: python3-pillow-tk
|
||||
BuildRequires: python3-tkinter
|
||||
%endif
|
||||
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
Requires: python3-pillow-tk
|
||||
Requires: python3-tkinter
|
||||
@@ -270,7 +289,9 @@ Requires: python3-tkinter
|
||||
%if %{with wx}
|
||||
%package -n python3-matplotlib-wx
|
||||
Summary: WX backend for python3-matplotlib
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: python3dist(wxpython)
|
||||
%endif
|
||||
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
|
||||
Requires: python3dist(wxpython)
|
||||
|
||||
@@ -343,11 +364,8 @@ 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
|
||||
%if %{without bundled_fonts}
|
||||
rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
|
||||
rm -rf %{buildroot}%{python3_sitearch}/matplotlib/mpl-data/fonts
|
||||
%endif
|
||||
|
||||
|
||||
@@ -356,12 +374,14 @@ rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
|
||||
# These files confuse pytest, and we want to test the installed copy.
|
||||
rm -rf build*/
|
||||
|
||||
%ifnarch %{ix86}
|
||||
# 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
|
||||
%endif
|
||||
# Also prime the font cache.
|
||||
%{py3_test_envvars} %{python3} -c 'import matplotlib.font_manager'
|
||||
|
||||
@@ -376,9 +396,13 @@ env MPLCONFIGDIR=$PWD \
|
||||
%{pytest} -ra -n auto \
|
||||
-m 'not network' -k "${k-}" \
|
||||
--pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d
|
||||
%ifnarch %{ix86}
|
||||
# Skip GTK3Cairo tests that are broken in virtual display.
|
||||
k="${k-}${k+ and }not (test_interactive_thread_safety and gtk3cairo)"
|
||||
k="${k-}${k+ and }not (test_interactive_timers and gtk3cairo)"
|
||||
# These two segfault, resp. timeout in Python 3.14 Copr test environment
|
||||
k="${k-}${k+ and }not test_interactive_thread_safety"
|
||||
k="${k-}${k+ and }not test_figuremanager_cleans_own_mainloop"
|
||||
# Run backend tests with Wayland.
|
||||
wlheadless-run -- env MPLCONFIGDIR=$PWD GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland \
|
||||
%{pytest} -vra -n auto \
|
||||
@@ -390,17 +414,12 @@ xwfb-run -- env MPLCONFIGDIR=$PWD \
|
||||
-m 'not network' -k "${k-}" \
|
||||
--pyargs matplotlib.tests.test_backend_gtk3 matplotlib.tests.test_backend_qt matplotlib.tests.test_backend_tk matplotlib.tests.test_backends_interactive
|
||||
%endif
|
||||
|
||||
|
||||
%files -n python3-matplotlib-data
|
||||
%{_datadir}/matplotlib/mpl-data/
|
||||
%if %{with bundled_fonts}
|
||||
%exclude %{_datadir}/matplotlib/mpl-data/fonts/
|
||||
%endif
|
||||
|
||||
%if %{with bundled_fonts}
|
||||
|
||||
%files -n python3-matplotlib-data-fonts
|
||||
%{_datadir}/matplotlib/mpl-data/fonts/
|
||||
%if %{with bundled_fonts}
|
||||
%{python3_sitearch}/matplotlib/mpl-data/fonts/
|
||||
%endif
|
||||
|
||||
%files -n python3-matplotlib-doc
|
||||
|
||||
4
sources
4
sources
@@ -1,2 +1,2 @@
|
||||
SHA512 (matplotlib-3.10.3.tar.gz) = c3027fa116f45a4a7d7ac8e7ce87f509a6604b283c39b74379e8d84a05df61283ddf4e79036c9b83b2dff13291b59945d26aeb7420873d3b275097817a12be72
|
||||
SHA512 (matplotlib-3.10.3-with-freetype-2.13.1.tar.gz) = bb32e57bbd341c652d03361e3785145a9e89f59709eb588882f81cba4061c8aa7250c0d46ed07a588d75a055d72bbc6126c59e8777634385a458287f6ef8812f
|
||||
SHA512 (matplotlib-3.10.8.tar.gz) = 66d07fb0b13821e88f6e6fe9f9882542340c074198dce7d5f8bf5d65d1c64326ae7517ad38d6357491c54aedd8cd1b03f555ad6d9337754db5dbd43c6305ab3f
|
||||
SHA512 (matplotlib-3.10.8-with-freetype-2.14.1.tar.gz) = 03f5b406caced1e2a59f914a64808b146954ce2285551cb2314664f883a05cbc93a92a28f5c259817a77e048012542d09a0180a230591e40ccef297f477a1e5b
|
||||
|
||||
Reference in New Issue
Block a user