diff --git a/matplotlib-3.4.3.tar.gz b/matplotlib-3.4.3.tar.gz deleted file mode 100644 index 8431eba..0000000 --- a/matplotlib-3.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 -size 37850796 diff --git a/matplotlib-3.5.1.tar.gz b/matplotlib-3.5.1.tar.gz new file mode 100644 index 0000000..dc5e8d4 --- /dev/null +++ b/matplotlib-3.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c +size 35320470 diff --git a/matplotlib-setup.cfg b/matplotlib-mplsetup.cfg similarity index 68% rename from matplotlib-setup.cfg rename to matplotlib-mplsetup.cfg index 485e447..b71bb0c 100644 --- a/matplotlib-setup.cfg +++ b/matplotlib-mplsetup.cfg @@ -1,14 +1,13 @@ -# Rename this file to setup.cfg to modify Matplotlib's build options. - -[egg_info] +# Rename this file to mplsetup.cfg to modify Matplotlib's build options. [libs] # By default, Matplotlib builds with LTO, which may be slow if you re-compile # often, and don't need the space saving/speedup. #enable_lto = True -# By default, Matplotlib downloads and builds its own copy of FreeType, and -# builds its own copy of Qhull. You may set the following to True to instead -# link against a system FreeType/Qhull. +# By default, Matplotlib downloads and builds its own copies of FreeType and of +# Qhull. You may set the following to True to instead link against a system +# FreeType/Qhull. As an exception, Matplotlib defaults to the system version +# of FreeType on AIX. #system_freetype = False #system_qhull = False @@ -17,7 +16,6 @@ # considered optional. All except 'tests' data (meaning the baseline # image files) are installed by default, but that can be changed here. tests = True -sample_data = True [gui_support] # Matplotlib supports multiple GUI toolkits, known as backends. @@ -30,8 +28,8 @@ sample_data = True [rc_options] # User-configurable options # -# Default backend, one of: Agg, Cairo, GTK3Agg, GTK3Cairo, MacOSX, Pdf, Ps, -# Qt4Agg, Qt5Agg, SVG, TkAgg, WX, WXAgg. +# Default backend, one of: Agg, Cairo, GTK3Agg, GTK3Cairo, GTK4Agg, GTK4Cairo, +# MacOSX, Pdf, Ps, QtAgg, QtCairo, SVG, TkAgg, WX, WXAgg. # # The Agg, Ps, Pdf and SVG backends do not require external dependencies. Do # not choose MacOSX if you have disabled the relevant extension modules. The diff --git a/python-matplotlib.changes b/python-matplotlib.changes index 5a37c89..85f2c57 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +Tue Dec 14 18:40:21 UTC 2021 - Ben Greiner + +- Skip tests which crash with oom + +------------------------------------------------------------------- +Sun Dec 12 18:26:25 UTC 2021 - Ben Greiner + +- Update to version 3.5.1 + * https://matplotlib.org/stable/users/prev_whats_new/whats_new_3.5.0.html + * Figure and Axes creation / management + - subplot_mosaic supports simple Axes sharing + - Figure now has draw_without_rendering method + - Figure __init__ passes keyword arguments through to set + * Plotting methods + - Add Annulus patch + - set_data method for FancyArrow patch + - New arrow styles in ArrowStyle and ConnectionPatch + - Setting collection offset transform after initialization + * Colors and colormaps + - Colormap registry (experimental) + - Image interpolation now possible at RGBA stage + - imshow supports half-float arrays + - A callback registry has been added to Normalize objects + * Titles, ticks, and labels + - Settings tick positions and labels simultaneously in + set_ticks + * Fonts and Text + - Triple and quadruple dot mathtext accents + - Font properties of legend title are configurable + - Text and TextBox added parse_math option + - Text can be positioned inside TextBox widget + - Simplifying the font setting for usetex mode + - Type 42 subsetting is now enabled for PDF/PS backends + * rcParams improvements + - Allow setting default legend labelcolor globally + * 3D Axes improvements + - Axes3D now allows manual control of draw order + - Allow changing the vertical axis in 3d plots + - plot_surface supports masked arrays and NaNs + - 3D plotting methods support data keyword argument + * Interactive tool improvements + - Colorbars now have pan and zoom functionality + - Updated the appearance of Slider widgets + - Removing points on a PolygonSelector + - Dragging selectors + - Clearing selectors + - Setting artist properties of selectors + - Ignore events outside selection + - CallbackRegistry objects gain a method to temporarily block + signals + - Directional sizing cursors + * Sphinx extensions + - More configuration of mathmpl sphinx extension + * Backend-specific improvements + - GTK backend + - Qt backends + - HiDPI support in Cairo-based, GTK, and Tk backends + - Qt figure options editor improvements + - WX backends support mouse navigation buttons + - WebAgg uses asyncio instead of Tornado +- Add gtk4 and gtk-common subpackages + ------------------------------------------------------------------- Wed Dec 8 04:42:16 UTC 2021 - Steve Kowalik diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 33fad14..f858541 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -31,25 +31,29 @@ ExclusiveArch: x86_64 aarch64 %bcond_with test %endif Name: python-matplotlib%{psuffix} -Version: 3.4.3 +Version: 3.5.1 Release: 0 Summary: Plotting Library for Python License: SUSE-Matplotlib URL: https://matplotlib.org Source: https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-%{version}.tar.gz -Source1: matplotlib-setup.cfg +Source1: matplotlib-mplsetup.cfg # Bundled version of freetype and qhull for testing purposes only Source98: http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz Source99: https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz BuildRequires: %{python_module Cycler >= 0.10} +BuildRequires: %{python_module FontTools >= 4.22.0} BuildRequires: %{python_module devel} BuildRequires: %{python_module kiwisolver >= 1.0.1} -BuildRequires: %{python_module numpy >= 1.16} +BuildRequires: %{python_module numpy >= 1.17} BuildRequires: %{python_module numpy-devel >= 1.16} +BuildRequires: %{python_module packaging >= 20.0} BuildRequires: %{python_module pip} BuildRequires: %{python_module pyparsing > 2.2.1} BuildRequires: %{python_module pytz} +BuildRequires: %{python_module setuptools_scm_git_archive} +BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} BuildRequires: c++_compiler BuildRequires: fdupes @@ -57,9 +61,11 @@ BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: qhull-devel >= 2003.1 Requires: python-Cycler >= 0.10 +Requires: python-FontTools >= 4.22.0 Requires: python-Pillow >= 6.2 Requires: python-kiwisolver >= 1.0.1 -Requires: python-numpy >= 1.16 +Requires: python-numpy >= 1.17 +Requires: python-packaging >= 20.0 Requires: python-pyparsing > 2.2.1 Requires: python-python-dateutil >= 2.7 Requires: python-pytz @@ -70,9 +76,6 @@ Recommends: python-certifi Recommends: (%{python_flavor}-matplotlib-tk if tk) Provides: python-matplotlib-gtk = %{version} Obsoletes: python-matplotlib-gtk < %{version} -# SECTION WebAgg dependencies -BuildRequires: %{python_module tornado} -# /SECTION # SECTION tk dependencies via tcl BuildRequires: tcl BuildRequires: pkgconfig(freetype2) >= 2.3 @@ -80,11 +83,10 @@ BuildRequires: pkgconfig(libpng) >= 1.2 BuildRequires: pkgconfig(tcl) # /SECTION %if %{with test} -BuildRequires: %{python_module Pillow >= 6.2} -BuildRequires: %{python_module cairo} -BuildRequires: %{python_module gobject-Gdk} +BuildRequires: %{python_module matplotlib = %{version}} BuildRequires: %{python_module matplotlib-cairo = %{version}} BuildRequires: %{python_module matplotlib-gtk3 = %{version}} +BuildRequires: %{python_module matplotlib-gtk4 = %{version}} BuildRequires: %{python_module matplotlib-qt5 = %{version}} BuildRequires: %{python_module matplotlib-testdata = %{version}} BuildRequires: %{python_module matplotlib-tk = %{version}} @@ -93,39 +95,11 @@ BuildRequires: %{python_module matplotlib-wx = %{version}} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest-xvfb} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module python-dateutil >= 2.7} -BuildRequires: %{python_module qt5} -BuildRequires: %{python_module tk} -BuildRequires: %{python_module wxPython >= 4} -# SECTION latex dependencies +# SECTION latex test dependencies +BuildRequires: %{python_module matplotlib-latex = %{version}} BuildRequires: ghostscript BuildRequires: inkscape BuildRequires: poppler-tools -# https://github.com/search?q=usepackage+repo%3Amatplotlib%2Fmatplotlib+path%3Alib&type=Code -BuildRequires: texlive-dvipng -BuildRequires: texlive-dvips -BuildRequires: texlive-geometry -BuildRequires: texlive-graphics -BuildRequires: texlive-helvetic -BuildRequires: texlive-latex -BuildRequires: texlive-pgf -BuildRequires: texlive-sfmath -BuildRequires: texlive-tex -BuildRequires: texlive-txfonts -BuildRequires: texlive-xcolor -BuildRequires: tex(avant.sty) -BuildRequires: tex(chancery.sty) -BuildRequires: tex(charter.sty) -BuildRequires: tex(courier.sty) -BuildRequires: tex(geometry.sty) -BuildRequires: tex(helvet.sty) -BuildRequires: tex(mathpazo.sty) -BuildRequires: tex(mathptmx.sty) -BuildRequires: tex(pncr.tfm) -BuildRequires: tex(psfrag.sty) -BuildRequires: tex(type1cm.sty) -BuildRequires: tex(type1ec.sty) -BuildRequires: tex(ucs.sty) # /SECTION %endif %python_subpackages @@ -149,20 +123,43 @@ for the %{name} plotting package %package gtk3 Summary: GTK3 backends for %{name} -License: BSD-2-Clause +License: SUSE-Matplotlib Requires: %{name} = %{version} -Requires: %{name}-cairo = %{version} -Requires: python-gobject-Gdk +Requires: %{name}-gtk-common = %{version} %description gtk3 This package includes the GTK3-based gtk3, gtk3agg, and gtk3cairo backends for the %{name} plotting package +%package gtk4 +Summary: GTK4 backends for %{name} +License: SUSE-Matplotlib +Requires: %{name} = %{version} +Requires: %{name}-gtk-common = %{version} + +%description gtk4 +This package includes the GTK4-based gtk4, gtk4agg, and +gtk4cairo backends for the %{name} plotting package + +%package gtk-common +Summary: code common for GTK3 and GTK4 backends for %{name} +License: SUSE-Matplotlib +Requires: %{name} = %{version} +Requires: %{name}-cairo = %{version} +Requires: gdk-pixbuf-loader-rsvg +Requires: python-gobject-Gdk +Requires: python-gobject-cairo + +%description gtk-common +This package provides code common for the GTK3 and GTK4 backends +for the %{name} plotting package + %package latex Summary: Allow rendering latex in %{name} -License: BSD-2-Clause +License: SUSE-Matplotlib Requires: %{name} = %{version} # grep usepackage lib/matplotlib/texmanager.py lib/matplotlib/backends/backend_pgf.py +# https://github.com/search?q=usepackage+repo%3Amatplotlib%2Fmatplotlib+path%3Alib&type=Code Requires: texlive-dvipng Requires: texlive-dvips Requires: texlive-geometry @@ -187,6 +184,7 @@ Requires: tex(psfrag.sty) Requires: tex(type1cm.sty) Requires: tex(type1ec.sty) Requires: tex(ucs.sty) +Requires: tex(underscore.sty) %description latex This package allows %{name} to display latex in plots @@ -194,7 +192,7 @@ and figures. %package qt5 Summary: Qt5 backend for %{name} -License: BSD-2-Clause +License: SUSE-Matplotlib Requires: %{name} = %{version} Requires: python-qt5 Provides: %{name}-qt-shared = %{version} @@ -206,7 +204,7 @@ for the %{name} plotting package %package testdata Summary: Test data for %{name} -License: BSD-2-Clause +License: SUSE-Matplotlib Requires: %{name} = %{version} %description testdata @@ -215,8 +213,9 @@ for the %{name} plotting package %package tk Summary: Tk backend for %{name} -License: BSD-2-Clause +License: SUSE-Matplotlib Requires: %{name} = %{version} +Requires: python-Pillow-tk Requires: python-tk Requires: tcl >= 8.3 @@ -226,7 +225,7 @@ for the %{name} plotting package %package web Summary: Web backend for %{name} -License: BSD-2-Clause +License: SUSE-Matplotlib Requires: %{name} = %{version} Requires: python-tornado @@ -236,7 +235,7 @@ for the %{name} plotting package %package wx Summary: WxWidgets backend for %{name} -License: BSD-2-Clause +License: SUSE-Matplotlib Requires: %{name} = %{version} Requires: python-wxPython >= 4 @@ -256,7 +255,7 @@ cp %{SOURCE99} ~/.cache/matplotlib/${SHA} chmod -x lib/matplotlib/mpl-data/images/*.svg find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/env python||" {} \; find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/python||" {} \; -cp %{SOURCE1} setup.cfg +cp %{SOURCE1} mplsetup.cfg # The setup procedure wants certifi to download packages over https. Not applicable here. sed -i '/"certifi>=.*"/ d' setup.py @@ -288,8 +287,8 @@ skip_tests+=" or (test_correct_key and Qt4Agg)" skip_tests+=" or (test_fig_close and Qt4Agg)" # timing tests on obs can fail unpredictably skip_tests+=" or test_invisible_Line_rendering" -# currently broken, revert with 3.5.0 -skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" +# too much memory consumption on obs parallel workers +skip_tests+=" or (test_agg and chunksize) or test_throw_rendering_complexity_exceeded" %{pytest_arch --pyargs matplotlib.tests \ --pyargs mpl_toolkits.tests \ -n auto \ @@ -305,17 +304,22 @@ skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" %doc README.rst %doc examples/ %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %{python_sitearch}/matplotlib/ %{python_sitearch}/matplotlib-%{version}-py*.egg-info %{python_sitearch}/matplotlib-%{version}-py*-nspkg.pth %{python_sitearch}/mpl_toolkits %{python_sitearch}/pylab.py* %pycache_only %{python_sitearch}/__pycache__/pylab.* +%exclude %{python_sitearch}/matplotlib/backends/_backend_tk.py +%exclude %{python_sitearch}/matplotlib/backends/_backend_gtk.py %exclude %{python_sitearch}/matplotlib/backends/backend_cairo.* %exclude %{python_sitearch}/matplotlib/backends/backend_gtk3.* %exclude %{python_sitearch}/matplotlib/backends/backend_gtk3agg.* %exclude %{python_sitearch}/matplotlib/backends/backend_gtk3cairo.* +%exclude %{python_sitearch}/matplotlib/backends/backend_gtk4.* +%exclude %{python_sitearch}/matplotlib/backends/backend_gtk4agg.* +%exclude %{python_sitearch}/matplotlib/backends/backend_gtk4cairo.* %exclude %{python_sitearch}/matplotlib/backends/backend_qt4.py* %exclude %{python_sitearch}/matplotlib/backends/backend_qt4agg.py* %exclude %{python_sitearch}/matplotlib/backends/backend_qt4cairo.py* @@ -332,10 +336,15 @@ skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" %exclude %{python_sitearch}/matplotlib/backends/qt_compat.* %exclude %{python_sitearch}/matplotlib/backends/qt_editor/ %exclude %{python_sitearch}/matplotlib/backends/web_backend/ +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/_backend_tk.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/_backend_gtk.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_cairo.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3cairo.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk4.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk4agg.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk4cairo.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4cairo.*.py* @@ -357,17 +366,17 @@ skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" # Dummy package to pull in latex dependencies. %files %{python_files latex} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %files %{python_files cairo} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %{python_sitearch}/matplotlib/backends/backend_cairo.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_cairo.*.py* %files %{python_files gtk3} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %{python_sitearch}/matplotlib/backends/backend_gtk3.py* %{python_sitearch}/matplotlib/backends/backend_gtk3agg.py* %{python_sitearch}/matplotlib/backends/backend_gtk3cairo.py* @@ -375,9 +384,25 @@ skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.*.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3cairo.*.py* +%files %{python_files gtk4} +%license LICENSE/ +%license doc/users/project/license.rst +%{python_sitearch}/matplotlib/backends/backend_gtk4.py* +%{python_sitearch}/matplotlib/backends/backend_gtk4agg.py* +%{python_sitearch}/matplotlib/backends/backend_gtk4cairo.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk4.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk4agg.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk4cairo.*.py* + +%files %{python_files gtk-common} +%license LICENSE/ +%license doc/users/project/license.rst +%{python_sitearch}/matplotlib/backends/_backend_gtk.py +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/_backend_gtk.*.py* + %files %{python_files qt5} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %{python_sitearch}/matplotlib/backends/backend_qt5.py* %{python_sitearch}/matplotlib/backends/backend_qt5agg.py* %{python_sitearch}/matplotlib/backends/backend_qt5cairo.py* @@ -390,7 +415,7 @@ skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" %files %{python_files testdata} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %{python_sitearch}/matplotlib/tests/baseline_images %{python_sitearch}/matplotlib/tests/tinypages %{python_sitearch}/mpl_toolkits/tests/baseline_images @@ -399,15 +424,17 @@ skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" %files %{python_files tk} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst +%{python_sitearch}/matplotlib/backends/_backend_tk.py* %{python_sitearch}/matplotlib/backends/backend_tkagg.py* %{python_sitearch}/matplotlib/backends/backend_tkcairo.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/_backend_tk.*.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_tkcairo.*.py* %files %{python_files web} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %{python_sitearch}/matplotlib/backends/backend_webagg.py* %{python_sitearch}/matplotlib/backends/backend_webagg_core.py* %{python_sitearch}/matplotlib/backends/web_backend/ @@ -417,7 +444,7 @@ skip_tests+=" or test_mathtext_rendering or test_mathtext_exceptions" %files %{python_files wx} %license LICENSE/ -%license doc/users/license.rst +%license doc/users/project/license.rst %{python_sitearch}/matplotlib/backends/backend_wx.py* %{python_sitearch}/matplotlib/backends/backend_wxagg.py* %{python_sitearch}/matplotlib/backends/backend_wxcairo.py*