From 368a527512250832f65771513f9920aa16a98c6e8d37b815987c3472e625c600 Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 19 Sep 2018 01:59:45 +0000 Subject: [PATCH] Accepting request 636487 from home:TheBlackCat:branches:devel:languages:python:numeric - Update to version 3.0.0 * Improved default backend selection * Cyclic colormaps * Ability to scale axis by a fixed order of magnitude * Add AnchoredDirectionArrows feature to mpl_toolkits * Add minorticks_on()/off() methods for colorbar * Colorbar ticks can now be automatic * Don't automatically rename duplicate file names * Legend now has a *title_fontsize* kwarg (and rcParam) * Support for axes.prop_cycle property *markevery* in rcParams * Multipage PDF support for pgf backend * Pie charts are now circular by default * Add ax.get_gridspec to .SubplotBase * Axes titles will no longer overlap xaxis * New convenience methods for GridSpec * Figure has an ~.figure.Figure.add_artist method * math directive renamed to mathmpl - Python 2 support was dropped upstream, so disable it in the spec file and drop python2-specific parts. - Enable wx backend for python 3, since python 3 is now supported by wxPython upstream. OBS-URL: https://build.opensuse.org/request/show/636487 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-matplotlib?expand=0&rev=5 --- matplotlib-2.2.3.tar.gz | 3 -- matplotlib-3.0.0.tar.gz | 3 ++ python-matplotlib.changes | 25 ++++++++++ python-matplotlib.spec | 102 ++++++++++++++++++-------------------- 4 files changed, 76 insertions(+), 57 deletions(-) delete mode 100644 matplotlib-2.2.3.tar.gz create mode 100644 matplotlib-3.0.0.tar.gz diff --git a/matplotlib-2.2.3.tar.gz b/matplotlib-2.2.3.tar.gz deleted file mode 100644 index 04fe670..0000000 --- a/matplotlib-2.2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5 -size 36839609 diff --git a/matplotlib-3.0.0.tar.gz b/matplotlib-3.0.0.tar.gz new file mode 100644 index 0000000..318a714 --- /dev/null +++ b/matplotlib-3.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4e2333c98a7c2c1ff6eb930cd2b57d4b818de5437c5048802096b32f66e65f9 +size 36306021 diff --git a/python-matplotlib.changes b/python-matplotlib.changes index 44695fe..9c6dff3 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Sep 19 01:44:55 UTC 2018 - Todd R + +- Update to version 3.0.0 + * Improved default backend selection + * Cyclic colormaps + * Ability to scale axis by a fixed order of magnitude + * Add AnchoredDirectionArrows feature to mpl_toolkits + * Add minorticks_on()/off() methods for colorbar + * Colorbar ticks can now be automatic + * Don't automatically rename duplicate file names + * Legend now has a *title_fontsize* kwarg (and rcParam) + * Support for axes.prop_cycle property *markevery* in rcParams + * Multipage PDF support for pgf backend + * Pie charts are now circular by default + * Add ax.get_gridspec to .SubplotBase + * Axes titles will no longer overlap xaxis + * New convenience methods for GridSpec + * Figure has an ~.figure.Figure.add_artist method + * math directive renamed to mathmpl +- Python 2 support was dropped upstream, so disable it in the spec + file and drop python2-specific parts. +- Enable wx backend for python 3, since python 3 is now supported + by wxPython upstream. + ------------------------------------------------------------------- Tue Aug 14 15:19:00 UTC 2018 - toddrme2178@gmail.com diff --git a/python-matplotlib.spec b/python-matplotlib.spec index c453892..3eed639 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -21,9 +21,10 @@ %bcond_with tests %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python +%define oldpython python +%define skip_python2 1 Name: python-matplotlib -Version: 2.2.3 +Version: 3.0.0 Release: 0 Summary: Plotting Library for Python License: SUSE-Matplotlib @@ -82,8 +83,8 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: %{python_module qt4} # Qt5 dependencies BuildRequires: %{python_module qt5} -# Wx dependencies (currently Python 2 only) -BuildRequires: python-wxWidgets >= 3 +# Wx dependencies +BuildRequires: %{python_module wxPython >= 4} # tk dependencies BuildRequires: %{python_module tk} # X server needed for Qt4/Qt5 tests @@ -102,11 +103,6 @@ Requires: python-pyparsing > 2.1.6 Requires: python-python-dateutil >= 2.1 Requires: python-pytz Requires: python-six >= 1.10 -%ifpython2 -Requires: python-backports.functools_lru_cache -Requires: python-functools32 -Requires: python-subprocess32 -%endif Recommends: ghostscript Recommends: libxml2-tools Recommends: python-Pillow @@ -118,10 +114,6 @@ Recommends: python-matplotlib-tk %endif Provides: python-matplotlib-gtk = %{version} Obsoletes: python-matplotlib-gtk < %{version} -%ifpython2 -Provides: %{oldpython}-matplotlib-gtk = %{version} -Obsoletes: %{oldpython}-matplotlib-gtk < %{version} -%endif %python_subpackages @@ -132,18 +124,18 @@ environments across platforms. matplotlib can be used in python scripts, the python and ipython shell (ala matlab or mathematica), web application servers, and six graphical user interface toolkits. -%package cairo +%package cairo Summary: Cairo backend for %{name} License: SUSE-Matplotlib Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: python-cairocffi -%description cairo +%description cairo This package includes the non-interactive Cairo-based backend for the %{name} plotting package -%package gtk3 +%package gtk3 Summary: GTK3 backends for %{name} License: BSD-2-Clause Group: Development/Libraries/Python @@ -151,11 +143,11 @@ Requires: %{name} = %{version} Requires: %{name}-cairo = %{version} Requires: python-gobject -%description gtk3 +%description gtk3 This package includes the GTK3-based gtk3, gtk3agg, and gtk3cairo backends for the %{name} plotting package -%package latex +%package latex Summary: Allow rendering latex in %{name} License: BSD-2-Clause Group: Development/Libraries/Python @@ -167,22 +159,22 @@ Requires: texlive-tex Requires: texlive-sfmath %endif -%description latex +%description latex This package allows %{name} to display latex in plots and figures. -%package qt-shared +%package qt-shared Summary: Shared files for the Qt backends for %{name} License: BSD-2-Clause Group: Development/Libraries/Python Requires: %{name} = %{version} -%description qt-shared +%description qt-shared This package includes files needed by both the Qt4-based pyqt4 and pyside backends and the Qt5-based pyqt5 backend for the %{name} plotting package -%package qt4 +%package qt4 Summary: Qt4 backends for %{name} License: BSD-2-Clause Group: Development/Libraries/Python @@ -190,11 +182,11 @@ Requires: %{name} = %{version} Requires: %{name}-qt-shared = %{version} Requires: python-qt4 >= 4.0 -%description qt4 +%description qt4 This package includes the Qt4-based pyqt4 and pyside backends for the %{name} plotting package -%package qt5 +%package qt5 Summary: Qt5 backend for %{name} License: BSD-2-Clause Group: Development/Libraries/Python @@ -202,11 +194,11 @@ Requires: %{name} = %{version} Requires: %{name}-qt-shared = %{version} Requires: python-qt5 -%description qt5 +%description qt5 This package includes the Qt5-based pyqt5 backend for the %{name} plotting package -%package tk +%package tk Summary: Tk backend for %{name} License: BSD-2-Clause Group: Development/Libraries/Python @@ -214,29 +206,29 @@ Requires: %{name} = %{version} Requires: python-tk Requires: tcl >= 8.3 -%description tk +%description tk This package includes the Tk-based tkagg backend for the %{name} plotting package -%package web +%package web Summary: Web backend for %{name} License: BSD-2-Clause Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: python-tornado -%description web +%description web This package includes the browser-based webagg backend for the %{name} plotting package -%package -n %{python2_prefix}-matplotlib-wx +%package wx Summary: WxWidgets backend for %{name} License: BSD-2-Clause Group: Development/Libraries/Python Requires: %{name} = %{version} -Requires: python-wxWidgets >= 2.8 +Requires: python-wxPython >= 4 -%description -n %{python2_prefix}-matplotlib-wx +%description wx This package includes the wxWidgets-based wxagg backend for %{name} plotting package @@ -302,33 +294,32 @@ trap "kill $! || true" EXIT %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.* %exclude %{python_sitearch}/matplotlib/backends/backend_webagg.* %exclude %{python_sitearch}/matplotlib/backends/backend_webagg_core.* +%exclude %{python_sitearch}/matplotlib/backends/backend_wx.* +%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.* %exclude %{python_sitearch}/matplotlib/backends/qt_compat.* %exclude %{python_sitearch}/matplotlib/backends/qt_editor/ %exclude %{python_sitearch}/matplotlib/backends/tkagg.* %exclude %{python_sitearch}/matplotlib/backends/web_backend/ +%exclude %{python_sitearch}/matplotlib/backends/wx_compat.* %endif %ifpycache %if 0%{?is_opensuse} -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_cairo.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3cairo.* +%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_qt4.*.py* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*.py* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg_core.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/qt_compat.* -%exclude %{python_sitearch}/matplotlib/backends/__pycache__/tkagg.* -%endif -%endif -%ifpython2 -%if 0%{?is_opensuse} -%exclude %{python_sitearch}/matplotlib/backends/backend_wx.py* -%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.py* -%exclude %{python_sitearch}/matplotlib/backends/wx_compat.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg_core.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_wx.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_wxagg.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/qt_compat.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/tkagg.*.py* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/wx_compat.*.py* %endif %endif @@ -401,12 +392,15 @@ trap "kill $! || true" EXIT %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg.*.py* %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg_core.*.py* -%files -n %{python2_prefix}-matplotlib-wx +%files %{python_files wx} %license LICENSE/ %license doc/users/license.rst -%{python2_sitearch}/matplotlib/backends/wx_compat.py* -%{python2_sitearch}/matplotlib/backends/backend_wx.py* -%{python2_sitearch}/matplotlib/backends/backend_wxagg.py* +%{python_sitearch}/matplotlib/backends/wx_compat.py* +%{python_sitearch}/matplotlib/backends/backend_wx.py* +%{python_sitearch}/matplotlib/backends/backend_wxagg.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/wx_compat.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_wx.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_wxagg.*.py* %endif