Update to 3.7.0

This commit is contained in:
Elliott Sales de Andrade
2023-02-27 22:29:17 -05:00
parent 0b92076142
commit 6053ff6f06
10 changed files with 170 additions and 191 deletions

View File

@@ -30,14 +30,14 @@
%global _docdir_fmt %{name}
# Updated test images for new FreeType.
%global mpl_images_version 3.6.1
%global mpl_images_version 3.7.0
# The version of FreeType in this Fedora branch.
%global ftver 2.12.1
Name: python-matplotlib
Version: 3.6.3
%global Version 3.6.3
Version: 3.7.0
%global Version 3.7.0
Release: %autorelease
Summary: Python 2D plotting library
# qt_editor backend is MIT
@@ -53,15 +53,19 @@ Source1: mplsetup.cfg
Source1000: https://github.com/QuLogic/mpl-images/archive/v%{mpl_images_version}-with-freetype-%{ftver}/matplotlib-%{mpl_images_version}-with-freetype-%{ftver}.tar.gz
# Search in /etc/matplotlibrc:
Patch1001: 0001-matplotlibrc-path-search-fix.patch
Patch1002: 0002-Don-t-require-oldest-supported-numpy.patch
# Increase tolerances for new FreeType everywhere:
Patch1002: 0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
Patch1003: 0003-Increase-a-few-test-tolerances-on-some-arches.patch
Patch1003: 0003-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
# https://github.com/matplotlib/matplotlib/pull/21190#issuecomment-1223271888
Patch0001: 0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch
# https://github.com/matplotlib/matplotlib/pull/25068
Source2000: pgf_pdflatex.pdf
Source2001: pgf_rcupdate2.pdf
# https://github.com/matplotlib/matplotlib/pull/25280
Patch0002: 0006-Fix-setting-CSS-with-latest-GTK4.patch
# https://github.com/matplotlib/matplotlib/pull/25341
Patch0003: 0007-TST-Increase-test_set_line_coll_dash_image-tolerance.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -300,19 +304,22 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
# 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/~'
# Updated test images for new FreeType.
%patch1003 -p1
gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/~~'
# Copy mplsetup.cfg to the builddir
cp -p %{SOURCE1} mplsetup.cfg
%patch1003 -p1
# Backports or reported upstream
%patch0001 -p1
# https://github.com/matplotlib/matplotlib/pull/25068
cp -a %SOURCE2000 %SOURCE2001 lib/matplotlib/tests/baseline_images/test_backend_pgf/
# https://github.com/matplotlib/matplotlib/pull/25280
%patch0002 -p1
# https://github.com/matplotlib/matplotlib/pull/25341
%patch0003 -p1
%generate_buildrequires
@@ -327,7 +334,7 @@ MPLCONFIGDIR=$PWD %pyproject_wheel
%if %{with html}
# Need to make built matplotlib libs available for the sphinx extensions:
MPLCONFIGDIR=$PWD \
PYTHONPATH="%{pyprojec_site_lib}" \
PYTHONPATH="%{pyproject_site_lib}" \
make -C doc html
%endif
# Ensure all example files are non-executable so that the -doc
@@ -378,7 +385,7 @@ MPLCONFIGDIR=$PWD \
env %{pytest} -ra -n auto \
-m 'not network' \
-k 'not test_invisible_Line_rendering and not test_form_widget_get_with_datetime_and_date_fields' \
--pyargs matplotlib mpl_toolkits.tests
--pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d
%endif
@@ -401,13 +408,13 @@ MPLCONFIGDIR=$PWD \
%files -n python3-matplotlib
%license LICENSE/
%doc README.rst
%doc README.md
%{python3_sitearch}/matplotlib-*.dist-info/
%{python3_sitearch}/matplotlib-*-nspkg.pth
%{python3_sitearch}/matplotlib/
%exclude %{python3_sitearch}/matplotlib/tests/baseline_images/*
%{python3_sitearch}/mpl_toolkits/
%exclude %{python3_sitearch}/mpl_toolkits/tests/baseline_images/*
%exclude %{python3_sitearch}/mpl_toolkits/*/tests/baseline_images/*
%pycached %{python3_sitearch}/pylab.py
%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*.py
%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
@@ -421,7 +428,7 @@ MPLCONFIGDIR=$PWD \
%files -n python3-matplotlib-test-data
%{python3_sitearch}/matplotlib/tests/baseline_images/
%{python3_sitearch}/mpl_toolkits/tests/baseline_images/
%{python3_sitearch}/mpl_toolkits/*/tests/baseline_images/
%files -n python3-matplotlib-qt5
%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5*.py