Hello community, here is the log from the commit of package python-matplotlib for openSUSE:Factory checked in at 2017-05-06 18:29:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-matplotlib (Old) and /work/SRC/openSUSE:Factory/.python-matplotlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-matplotlib" Sat May 6 18:29:48 2017 rev:52 rq:492245 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-matplotlib/python-matplotlib.changes 2017-03-12 20:05:15.223112727 +0100 +++ /work/SRC/openSUSE:Factory/.python-matplotlib.new/python-matplotlib.changes 2017-05-06 18:29:53.969127420 +0200 @@ -1,0 +2,15 @@ +Sun Apr 30 17:33:15 UTC 2017 - [email protected] + +- Restore qt4 backend since qt4 still has maintained, + python3-comptible python bindings. +- Provide/obsolete gtk backend to avoid conflicts. + It doesn't have maintained, python3-compatible python bindings. + +------------------------------------------------------------------- +Mon Mar 27 16:06:41 UTC 2017 - [email protected] + +- Implement single-spec version +- Drop old qt4 and gtk2 backends +- Drop unmaintained qt designer widget + +------------------------------------------------------------------- Old: ---- matplotlibplugin.py matplotlibwidget.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-matplotlib.spec ++++++ --- /var/tmp/diff_new_pack.oYqlzq/_old 2017-05-06 18:29:55.332934979 +0200 +++ /var/tmp/diff_new_pack.oYqlzq/_new 2017-05-06 18:29:55.336934415 +0200 @@ -16,6 +16,11 @@ # +#Not doing tests because they take too long +%bcond_with tests + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-matplotlib Version: 2.0.0 Release: 0 @@ -25,104 +30,91 @@ Url: http://matplotlib.org Source: https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-%{version}.tar.gz Source1: matplotlib-setup.cfg -Source2: matplotlibplugin.py -Source3: matplotlibwidget.py BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-rpm-macros +BuildRequires: c++_compiler BuildRequires: fdupes BuildRequires: fltk-devel -BuildRequires: freetype2-devel >= 2.3 -BuildRequires: gcc-c++ BuildRequires: ghostscript -BuildRequires: libpng-devel >= 1.2 -BuildRequires: libxml2 -BuildRequires: pkg-config +BuildRequires: libxml2-tools BuildRequires: poppler-tools -BuildRequires: python-CXX-devel >= 6.2.4 -BuildRequires: python-Cycler -BuildRequires: python-devel -BuildRequires: python-imaging -BuildRequires: python-numpy-devel >= 1.6 -BuildRequires: python-pyparsing >= 1.5.6 -BuildRequires: python-python-dateutil >= 1.1 -BuildRequires: python-pytz -BuildRequires: python-setuptools -BuildRequires: python-six >= 1.3 BuildRequires: qhull-devel >= 2003.1 -# needed for testing -- Not doing tests because they take too long -# BuildRequires: inkscape -# BuildRequires: python-mock -# BuildRequires: python-nose -# cairo dependencies -BuildRequires: python-cairocffi -# GTK dependencies -BuildRequires: gtk2-devel -BuildRequires: libgnome-devel -%if 0%{?suse_version} != 1110 -BuildRequires: python-gobject -BuildRequires: python-gobject-devel +BuildRequires: pkg-config +BuildRequires: pkgconfig(freetype2) >= 2.3 +BuildRequires: pkgconfig(libpng) >= 1.2 +# Python 2 only +BuildRequires: python-functools32 +BuildRequires: python-subprocess32 +# Needed for all versions of python +BuildRequires: %{python_module devel} +BuildRequires: %{python_module Cycler} +BuildRequires: %{python_module Pillow} +BuildRequires: %{python_module numpy >= 1.6} +BuildRequires: %{python_module numpy-devel >= 1.6} +BuildRequires: %{python_module pyparsing >= 1.5.6} +BuildRequires: %{python_module python-dateutil >= 1.1} +BuildRequires: %{python_module pytz} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six >= 1.3} +# needed for testing +%if %{with tests} +BuildRequires: inkscape +BuildRequires: %{python_module mock} +BuildRequires: %{python_module nose} %endif -BuildRequires: python-gobject2 -BuildRequires: python-gobject2-devel -BuildRequires: python-gtk >= 2.2.0 -BuildRequires: python-gtk-devel >= 2.2.0 -%if 0%{?suse_version} != 1110 +# cairo dependencies +BuildRequires: %{python_module cairocffi} +# GTK3 dependencies +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: %{python_module gobject} +BuildRequires: %{python_module gobject-devel} # latex dependencies BuildRequires: texlive-dvipng BuildRequires: texlive-latex BuildRequires: texlive-tex -%if 0%{?suse_version} != 1315 BuildRequires: texlive-sfmath -%endif -%endif # Qt4 dependencies -%if 0%{?suse_version} != 1110 -BuildRequires: python-pyside -%endif -BuildRequires: python-qt4 -BuildRequires: python-qt4-devel -%ifarch %{ix86} x86_64 -%if 0%{?suse_version} >= 1315 && 0%{?is_opensuse} != 0 +BuildRequires: %{python_module qt4} +BuildRequires: %{python_module qt4-devel} # Qt5 dependencies -BuildRequires: python-qt5 -BuildRequires: python-qt5-devel -%endif -%endif +BuildRequires: %{python_module qt5} +BuildRequires: %{python_module qt5-devel} # tk dependencies -BuildRequires: python-tk +BuildRequires: %{python_module tk} BuildRequires: tcl -BuildRequires: tcl-devel BuildRequires: tk -BuildRequires: tk-devel +BuildRequires: pkgconfig(tcl) +BuildRequires: pkgconfig(tk) # WebAgg dependencies -BuildRequires: python-tornado -%if 0%{?suse_version} != 1110 && 0%{?suse_version} != 1315 || 0%{?suse_version} >= 1315 && 0%{?is_opensuse} != 0 -%if 0%{?suse_version} >= 1320 +BuildRequires: %{python_module tornado} +# Wx dependencies (currently Python 2 only) BuildRequires: python-wxWidgets BuildRequires: wxWidgets-devel >= 3 -%else -# Wx dependencies -BuildRequires: python-wxWidgets >= 2.8 -BuildRequires: wxWidgets-devel -%define _use_internal_dependency_generator 0 -%define __find_requires %wx_requires -%endif -%endif Requires: python-Cycler -Requires: python-functools32 Requires: python-numpy >= 1.6 Requires: python-pyparsing >= 1.5.6 Requires: python-python-dateutil >= 1.1 Requires: python-pytz Requires: python-six >= 1.3 +%ifpython2 +Requires: python-functools32 +Requires: python-subprocess32 +%endif Recommends: ghostscript Recommends: libxml2-tools -Recommends: python-imaging +Recommends: python-Pillow Recommends: poppler-tools Recommends: python-matplotlib-tk -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +# Change <= to < in next release after 2.0.0 +Provides: python-matplotlib-gtk = %{version} +Obsoletes: python-matplotlib-gtk <= %{version} +%ifpython2 +Provides: %{oldpython}-matplotlib-gtk = %{version} +Obsoletes: %{oldpython}-matplotlib-gtk <= %{version} %endif +%python_subpackages + %description matplotlib is a python 2D plotting library which produces publication quality figures in a variety of hardcopy formats and interactive @@ -141,19 +133,6 @@ This package includes the non-interactive Cairo-based backend for the %{name} plotting package -%package gtk2 -Summary: GTK2 backends for %{name} -License: BSD-2-Clause -Group: Development/Libraries/Python -Requires: %{name} = %{version} -Requires: %{name}-cairo = %{version} -Requires: python-gobject2 -Requires: python-gtk >= 2.2.0 - -%description gtk2 -This package includes the GTK2-based gdk, gtk, gtkagg, and -gtkcairo backends for the %{name} plotting package - %package gtk3 Summary: GTK3 backends for %{name} License: BSD-2-Clause @@ -197,7 +176,6 @@ Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: %{name}-qt-shared = %{version} -Requires: python-pyside Requires: python-qt4 >= 4.0 %description qt4 @@ -216,19 +194,6 @@ This package includes the Qt5-based pyqt5 backend for the %{name} plotting package -%package designer -Summary: Qt Designer plugin for %{name} -License: MIT -Group: Development/Libraries/Python -Requires: %{name}-qt4 = %{version} -Requires: qt-creator - -%description designer -This is a plugin and widget to let you use %{name} -plots as widget in PyQt4 GUIs using Qt Designer - -This plugin comes from Python(x,y) - %package tk Summary: Tk backend for %{name} License: BSD-2-Clause @@ -252,14 +217,14 @@ This package includes the browser-based webagg backend for the %{name} plotting package -%package wx +%package -n %{python2_prefix}-matplotlib-wx Summary: WxWidgets backend for %{name} License: BSD-2-Clause Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: python-wxWidgets >= 2.8 -%description wx +%description -n %{python2_prefix}-matplotlib-wx This package includes the wxWidgets-based wxagg backend for %{name} plotting package @@ -271,25 +236,20 @@ %build cp %{SOURCE1} ./setup.cfg -%if 0%{?suse_version} > 1310 export XDG_RUNTIME_DIR=/tmp -%endif -python setup.py build +%python_build %install -%if 0%{?suse_version} > 1310 export XDG_RUNTIME_DIR=/tmp -%endif -python setup.py install --root=%{buildroot} --prefix=%{_prefix} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} -# Install designer plugin -mkdir -p %{buildroot}%{_libdir}/qt4/plugins/designer/python/ -install -vm 755 %{SOURCE2} %{buildroot}%{_libdir}/qt4/plugins/designer/python/ -install -vm 755 %{SOURCE3} %{buildroot}%{python_sitearch}/ - -%fdupes %{buildroot}%{python_sitearch} +%if %{with tests} +%check +%python_exec tests.py +%endif -%files +%files %{python_files} %defattr(-,root,root,-) %doc README.rst LICENSE CHANGELOG PKG-INFO examples doc/users/license.rst %{python_sitearch}/matplotlib/ @@ -297,121 +257,112 @@ %{python_sitearch}/matplotlib-%{version}-py*-nspkg.pth %{python_sitearch}/mpl_toolkits %{python_sitearch}/pylab.py* -%exclude %{python_sitearch}/matplotlib/backends/_backend_gdk.so -%exclude %{python_sitearch}/matplotlib/backends/_gtkagg.so -%exclude %{python_sitearch}/matplotlib/backends/_tkagg.so +%pycache_only %{python_sitearch}/__pycache__/pylab.* %exclude %{python_sitearch}/matplotlib/backends/backend_cairo.* -%exclude %{python_sitearch}/matplotlib/backends/backend_cocoaagg.* -%exclude %{python_sitearch}/matplotlib/backends/backend_gdk.* -%exclude %{python_sitearch}/matplotlib/backends/backend_gtk.* -%exclude %{python_sitearch}/matplotlib/backends/backend_gtkagg.* -%exclude %{python_sitearch}/matplotlib/backends/backend_gtkcairo.* %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_qt4.* -%exclude %{python_sitearch}/matplotlib/backends/backend_qt4agg.* +%exclude %{python_sitearch}/matplotlib/backends/backend_qt4.py* +%exclude %{python_sitearch}/matplotlib/backends/backend_qt4agg.py* %exclude %{python_sitearch}/matplotlib/backends/backend_qt5.* %exclude %{python_sitearch}/matplotlib/backends/backend_qt5agg.* %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/qt4_compat.* %exclude %{python_sitearch}/matplotlib/backends/tkagg.* -%exclude %{python_sitearch}/matplotlib/backends/qt_editor/ %exclude %{python_sitearch}/matplotlib/backends/web_backend/ -%exclude %{python_sitearch}/mpl_toolkits/gtktools.* - -%files cairo -%defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/backend_cairo.* +%ifpycache +%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_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__/qt4_compat.* +%exclude %{python_sitearch}/matplotlib/backends/__pycache__/tkagg.* +%endif +%ifpython2 +%exclude %{python_sitearch}/matplotlib/backends/backend_wx.py* +%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.py* +%exclude %{python_sitearch}/matplotlib/backends/wx_compat.py* +%endif -%files gtk2 -%defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/_backend_gdk.so -%{python_sitearch}/matplotlib/backends/_gtkagg.so -%{python_sitearch}/matplotlib/backends/backend_gdk.* -%{python_sitearch}/matplotlib/backends/backend_gtk.* -%{python_sitearch}/matplotlib/backends/backend_gtkagg.* -%{python_sitearch}/matplotlib/backends/backend_gtkcairo.* -%{python_sitearch}/mpl_toolkits/gtktools.* -%if 0%{?suse_version} != 1110 -%files gtk3 -%defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/backend_gtk3.* -%{python_sitearch}/matplotlib/backends/backend_gtk3agg.* -%{python_sitearch}/matplotlib/backends/backend_gtk3cairo.* -%endif +%files %{python_files cairo} +%defattr(-,root,root,-) +%{python_sitearch}/matplotlib/backends/backend_cairo.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_cairo.*.py* + +%files %{python_files gtk3} +%defattr(-,root,root,-) +%{python_sitearch}/matplotlib/backends/backend_gtk3.py* +%{python_sitearch}/matplotlib/backends/backend_gtk3agg.py* +%{python_sitearch}/matplotlib/backends/backend_gtk3cairo.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3cairo.*.py* -%if 0%{?suse_version} != 1110 # Dummy package to pull in latex dependencies. -%files latex +%files %{python_files latex} %defattr(-,root,root,-) %doc doc/users/usetex.rst -%endif + # IMPORTANT: the qt4 backend makes use of the qt5 backend, # which is actually a generic qt backend. -# So we need to package all the qt5 stuff in this generic -# package, and provide a stub package which pulls in the -# python-qt5 dependency. - -%files qt-shared -%defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/backend_qt5.* -%{python_sitearch}/matplotlib/backends/backend_qt5agg.* -%{python_sitearch}/matplotlib/backends/qt_compat.* -%{python_sitearch}/matplotlib/backends/qt4_compat.* +# So we need to package all the qt5 stuff in a generic +# package, and provide the -1t5 stub package which pulls in +# the python-qt5 dependency. +%files %{python_files qt-shared} +%defattr(-,root,root,-) +%{python_sitearch}/matplotlib/backends/backend_qt5.py* +%{python_sitearch}/matplotlib/backends/backend_qt5agg.py* +%{python_sitearch}/matplotlib/backends/qt4_compat.py* +%{python_sitearch}/matplotlib/backends/qt_compat.py* %{python_sitearch}/matplotlib/backends/qt_editor/ +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/qt4_compat.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/qt_compat.*.py* + +%files %{python_files qt4} +%{python_sitearch}/matplotlib/backends/backend_qt4.py* +%{python_sitearch}/matplotlib/backends/backend_qt4agg.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*.py* -%files qt4 -%defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/backend_qt4.* -%{python_sitearch}/matplotlib/backends/backend_qt4agg.* - -%files designer -%defattr(-,root,root,-) -%dir %{_libdir}/qt4/ -%dir %{_libdir}/qt4/plugins/ -%dir %{_libdir}/qt4/plugins/designer/ -%dir %{_libdir}/qt4/plugins/designer/python/ -%{_libdir}/qt4/plugins/designer/python/matplotlibplugin.py -%{python_sitearch}/matplotlibwidget.py - -%ifarch %{ix86} x86_64 -%if 0%{?suse_version} >= 1315 && 0%{?is_opensuse} != 0 -%files qt5 +%files %{python_files qt5} %defattr(-,root,root,-) -# IMPORTANT: the qt4 backend makes use of the qt5 backend, -# which is actually a generic qt backend. -# So we need to package all the qt5 stuff in a generic -# package, and provide this stub package which pulls in the -# python-qt5 dependency. %doc README.rst -%endif -%endif -%files tk +%files %{python_files tk} %defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/backend_tkagg.* -%{python_sitearch}/matplotlib/backends/tkagg.* -%{python_sitearch}/matplotlib/backends/_tkagg.so +%{python_sitearch}/matplotlib/backends/backend_tkagg.py* +%{python_sitearch}/matplotlib/backends/tkagg.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/tkagg.*.py* -%files web +%files %{python_files web} %defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/backend_webagg.* -%{python_sitearch}/matplotlib/backends/backend_webagg_core.* +%{python_sitearch}/matplotlib/backends/backend_webagg.py* +%{python_sitearch}/matplotlib/backends/backend_webagg_core.py* %{python_sitearch}/matplotlib/backends/web_backend/ +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg.*.py* +%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg_core.*.py* -%if 0%{?suse_version} != 1110 && 0%{?suse_version} != 1315 || 0%{?suse_version} >= 1315 && 0%{?is_opensuse} != 0 -%files wx +%files -n %{python2_prefix}-matplotlib-wx %defattr(-,root,root,-) -%{python_sitearch}/matplotlib/backends/backend_wx.* -%{python_sitearch}/matplotlib/backends/backend_wxagg.* -%endif +%{python2_sitearch}/matplotlib/backends/wx_compat.py* +%{python2_sitearch}/matplotlib/backends/backend_wx.py* +%{python2_sitearch}/matplotlib/backends/backend_wxagg.py* %changelog ++++++ matplotlib-setup.cfg ++++++ --- /var/tmp/diff_new_pack.oYqlzq/_old 2017-05-06 18:29:55.388927078 +0200 +++ /var/tmp/diff_new_pack.oYqlzq/_new 2017-05-06 18:29:55.392926514 +0200 @@ -70,14 +70,24 @@ # agg = True cairo = True -gtk = True -gtk3agg = Auto -gtk3cairo = Auto -gtkagg = True -pyside = Auto -qt4agg = Auto +gdk = False +gtk = False +gtkagg = False +gtkcairo = False +gtk3 = True +gtk3agg = True +gtk3cairo = True +nbagg = True +pdf = True +pgf = True +ps = True +qt4 = True +qt4agg = True +qt5 = True +qt5agg = True +svg = True tkagg = True -wxagg = Auto +webagg = True macosx = False windowing = False
