Update to latest version (#2274216)

python-matplotlib.spec

@@ -26,17 +26,19 @@
 %  endif
 %endif
 
+%global build_backend_args -Csetup-args="-Dsystem-freetype=true" -Csetup-args="-Dsystem-qhull=true" -Cinstall-args="--tags=data,python-runtime,runtime,tests"
+
 # Use the same directory of the main package for subpackage licence and docs
 %global _docdir_fmt %{name}
 
 # Updated test images for new FreeType.
-%global mpl_images_version 3.8.3
+%global mpl_images_version 3.9.0
 
 # The version of FreeType in this Fedora branch.
 %global ftver 2.13.1
 
 Name:           python-matplotlib
-Version:        3.8.4
+Version:        3.9.0
 %global Version %{version_no_tilde %{quote:%nil}}
 Release:        %autorelease
 Summary:        Python 2D plotting library
@@ -45,7 +47,6 @@ Summary:        Python 2D plotting library
 License:        PSF-2.0 AND MIT AND CC0-1.0
 URL:            https://matplotlib.org
 Source0:        %pypi_source matplotlib %{Version}
-Source1:        mplsetup.cfg
 
 # Fedora-specific patches; see:
 # https://github.com/fedora-python/matplotlib/tree/fedora-patches
@@ -60,9 +61,8 @@ Patch1003:      0003-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patc
 
 # 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/26502
-Patch0002:      0005-TST-Increase-some-tolerances-for-non-x86-arches.patch
 
+BuildRequires:  ipython
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-langpack-en
@@ -220,6 +220,7 @@ Obsoletes:      python3-matplotlib-qt4 < 3.5.0-0
 Summary:        Qt6 backend for python3-matplotlib
 BuildRequires:  python3dist(cairocffi)
 BuildRequires:  python3dist(pyqt6)
+BuildRequires:  python3-pyqt6
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3dist(cairocffi)
 Requires:       python3dist(pyqt6)
@@ -303,22 +304,19 @@ Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 # Updated test images for new FreeType.
 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
-
 # Backports or reported upstream
 %autopatch -p1 -M 999
 
 
 %generate_buildrequires
-%pyproject_buildrequires -r
+%pyproject_buildrequires -w %build_backend_args
 
 
 %build
 %set_build_flags
 export http_proxy=http://127.0.0.1/
 
-MPLCONFIGDIR=$PWD %pyproject_wheel
+MPLCONFIGDIR=$PWD %pyproject_wheel %build_backend_args
 %if %{with html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 MPLCONFIGDIR=$PWD \
@@ -336,7 +334,6 @@ export http_proxy=http://127.0.0.1/
 MPLCONFIGDIR=$PWD %pyproject_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
 
@@ -364,17 +361,22 @@ mktexfmt xelatex.fmt
 %{py3_test_envvars} %{python3} -c 'import matplotlib.font_manager'
 
 export http_proxy=http://127.0.0.1/
-# Skips:
-#  * test_invisible_Line_rendering: Checks for "slowness" that often fails on a
-#    heavily-loaded builder.
-#  * test_form_widget_get_with_datetime_and_date_fields is flaky.
+
+# This test checks for "slowness" that often fails on a heavily-loaded builder.
+k="${k-}${k+ and }not test_invisible_Line_rendering"
+# This test is flaky.
+k="${k-}${k+ and }not test_form_widget_get_with_datetime_and_date_fields"
+%ifarch %{ix86}
+# This test won't work due to Xvfb not existing.
+k="${k-}${k+ and }not test_cross_Qt_imports"
+%endif
+
 MPLCONFIGDIR=$PWD \
 %ifnarch %{ix86}
      xvfb-run -a -s "-screen 0 640x480x24" \
 %endif
          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' \
+             -m 'not network' -k "${k-}" \
              --pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d
 %endif