From 760f924558b42fddfcc3efbbce91ccd67db71329 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Mon, 4 Apr 2016 13:26:01 +0200 Subject: [PATCH] update to 1.5.1 (#1276806) Further fixes/changes: - Add missing requires of dvipng to python3-matplotlib (#1270202) - use bundled agg (#1276806) - Drop cxx patch (was dropped upstream) - Regenerate search path patch2 --- 20_matplotlibrc_path_search_fix.patch | 17 +++---- 40_bts608939_draw_markers_description.patch | 14 ------ 50_bts608942_spaces_in_param_args.patch | 50 --------------------- matplotlib-1.4.3-cbook.restrict_dict.patch | 32 ------------- python-matplotlib-system-cxx.patch | 18 -------- python-matplotlib.spec | 34 +++++++------- 6 files changed, 23 insertions(+), 142 deletions(-) delete mode 100644 40_bts608939_draw_markers_description.patch delete mode 100644 50_bts608942_spaces_in_param_args.patch delete mode 100644 matplotlib-1.4.3-cbook.restrict_dict.patch delete mode 100644 python-matplotlib-system-cxx.patch diff --git a/20_matplotlibrc_path_search_fix.patch b/20_matplotlibrc_path_search_fix.patch index 41246c4..b4d708a 100644 --- a/20_matplotlibrc_path_search_fix.patch +++ b/20_matplotlibrc_path_search_fix.patch @@ -1,14 +1,9 @@ -Description: Fixes the path to search for matplotlibrc file -Forwarded: not-needed -Author: Sandro Tosi - ---- a/lib/matplotlib/__init__.py -+++ b/lib/matplotlib/__init__.py -@@ -658,10 +658,12 @@ def _get_data_path(): - raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory') - return path +--- a/lib/matplotlib/__init__.py 2016-04-04 12:54:26.427194940 +0200 ++++ b/lib/matplotlib/__init__.py 2016-04-04 12:56:12.662590255 +0200 +@@ -682,9 +682,12 @@ -- path = os.sep.join([os.path.dirname(__file__), 'mpl-data']) + _file = _decode_filesystem_path(__file__) + path = os.sep.join([os.path.dirname(_file), 'mpl-data']) + path = '/usr/share/matplotlib/mpl-data' if os.path.isdir(path): return path @@ -18,7 +13,7 @@ Author: Sandro Tosi # setuptools' namespace_packages may highjack this init file # so need to try something known to be in matplotlib, not basemap import matplotlib.afm -@@ -786,7 +788,7 @@ def matplotlib_fname(): +@@ -812,7 +815,7 @@ home, '.matplotlib', 'matplotlibrc') return fname diff --git a/40_bts608939_draw_markers_description.patch b/40_bts608939_draw_markers_description.patch deleted file mode 100644 index 99fa033..0000000 --- a/40_bts608939_draw_markers_description.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: minor glitch in draw_markers() description -Author: Jakub Wilk - ---- a/doc/api/api_changes.rst -+++ b/doc/api/api_changes.rst -@@ -1143,7 +1143,7 @@ New methods: - - * :meth:`draw_markers(self, gc, marker_path, marker_trans, path, - trans, rgbFace) -- ` - - * :meth:`draw_path_collection(self, master_transform, cliprect, - clippath, clippath_trans, paths, all_transforms, offsets, diff --git a/50_bts608942_spaces_in_param_args.patch b/50_bts608942_spaces_in_param_args.patch deleted file mode 100644 index 123388d..0000000 --- a/50_bts608942_spaces_in_param_args.patch +++ /dev/null @@ -1,50 +0,0 @@ -Description: don't separate param and its argument with a space - ---- a/lib/mpl_toolkits/axes_grid1/axes_divider.py -+++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py -@@ -201,12 +201,12 @@ class Divider(object): - def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None): - """ - -- :param nx, nx1: Integers specifying the column-position of the -+ :param nx,nx1: Integers specifying the column-position of the - cell. When nx1 is None, a single nx-th column is - specified. Otherwise location of columns spanning between nx - to nx1 (but excluding nx1-th column) is specified. - -- :param ny, ny1: same as nx and nx1, but for row positions. -+ :param ny,ny1: same as nx and nx1, but for row positions. - """ - - figW, figH = self._fig.get_size_inches() - -@@ -250,12 +250,12 @@ class Divider(object): - (:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for - specified cell. - -- :param nx, nx1: Integers specifying the column-position of the -+ :param nx,nx1: Integers specifying the column-position of the - cell. When nx1 is None, a single nx-th column is - specified. Otherwise location of columns spanning between nx - to nx1 (but excluding nx1-th column) is specified. - -- :param ny, ny1: same as nx and nx1, but for row positions. -+ :param ny,ny1: same as nx and nx1, but for row positions. - """ - return AxesLocator(self, nx, ny, nx1, ny1) - -@@ -298,12 +298,12 @@ class AxesLocator(object): - """ - :param axes_divider: An instance of AxesDivider class. - -- :param nx, nx1: Integers specifying the column-position of the -+ :param nx,nx1: Integers specifying the column-position of the - cell. When nx1 is None, a single nx-th column is - specified. Otherwise location of columns spanning between nx - to nx1 (but excluding nx1-th column) is is specified. - -- :param ny, ny1: same as nx and nx1, but for row positions. -+ :param ny,ny1: same as nx and nx1, but for row positions. - """ - self._axes_divider = axes_divider - diff --git a/matplotlib-1.4.3-cbook.restrict_dict.patch b/matplotlib-1.4.3-cbook.restrict_dict.patch deleted file mode 100644 index 08347b0..0000000 --- a/matplotlib-1.4.3-cbook.restrict_dict.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2e445c2c4f66f1e0de9779a3fd966aaf8d8ed2c5 Mon Sep 17 00:00:00 2001 -From: Thomas A Caswell -Date: Sun, 17 May 2015 23:45:44 -0400 -Subject: [PATCH] Merge pull request #4439 from tswsl1989/restrict_dict_gdk - -FIX : Import cbook.restrict_dict into backend_gdk ---- - lib/matplotlib/backends/backend_gdk.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py -index fc705fe..024c27e 100644 ---- a/lib/matplotlib/backends/backend_gdk.py -+++ b/lib/matplotlib/backends/backend_gdk.py -@@ -26,7 +26,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name - from matplotlib._pylab_helpers import Gcf - from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \ - FigureManagerBase, FigureCanvasBase --from matplotlib.cbook import is_string_like -+from matplotlib.cbook import is_string_like, restrict_dict - from matplotlib.figure import Figure - from matplotlib.mathtext import MathTextParser - from matplotlib.transforms import Affine2D -@@ -477,7 +477,7 @@ def _print_image(self, filename, format, *args, **kwargs): - - # set the default quality, if we are writing a JPEG. - # http://www.pygtk.org/docs/pygtk/class-gdkpixbuf.html#method-gdkpixbuf--save -- options = cbook.restrict_dict(kwargs, ['quality']) -+ options = restrict_dict(kwargs, ['quality']) - if format in ['jpg','jpeg']: - if 'quality' not in options: - options['quality'] = rcParams['savefig.jpeg_quality'] diff --git a/python-matplotlib-system-cxx.patch b/python-matplotlib-system-cxx.patch deleted file mode 100644 index ea05840..0000000 --- a/python-matplotlib-system-cxx.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- setupext.py.orig 2014-01-25 15:06:39.460916454 +0100 -+++ setupext.py 2014-01-25 15:06:53.080946205 +0100 -@@ -841,15 +841,6 @@ - name = 'pycxx' - - def check(self): -- if PY3: -- # There is no version of PyCXX in the wild that will work -- # with Python 3.x and matplotlib, since they lack support -- # for the buffer object. -- self.__class__.found_external = False -- return ("Official versions of PyCXX are not compatible " -- "with matplotlib on Python 3.x, since they lack " -- "support for the buffer object. Using local " -- "copy") - - self.__class__.found_external = True - old_stdout = sys.stdout diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 6579cb0..6536aa9 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -45,8 +45,8 @@ %global _docdir_fmt %{name} Name: python-matplotlib -Version: 1.4.3 -Release: 13%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: Python 2D plotting library Group: Development/Libraries # qt4_editor backend is MIT @@ -56,13 +56,9 @@ URL: http://matplotlib.org Source0: matplotlib-%{version}-without-extern.tar.xz Source1: setup.cfg -Patch0: %{name}-noagg.patch -Patch1: %{name}-system-cxx.patch +#Patch0: %{name}-noagg.patch Patch2: 20_matplotlibrc_path_search_fix.patch -Patch3: 40_bts608939_draw_markers_description.patch -Patch4: 50_bts608942_spaces_in_param_args.patch Patch5: 70_bts720549_try_StayPuft_for_xkcd.patch -Patch6: matplotlib-1.4.3-cbook.restrict_dict.patch BuildRequires: agg-devel BuildRequires: freetype-devel @@ -90,6 +86,7 @@ BuildRequires: xorg-x11-server-Xvfb BuildRequires: zlib-devel Provides: bundled(agg) = 2.4 +Provides: bundled(ttconv) %description Matplotlib is a python 2D plotting library which produces publication @@ -269,6 +266,8 @@ Requires: python3-cairo Requires: python3-pyparsing Requires: python3-dateutil Requires: python3-pytz +Requires: dejavu-sans-fonts +Requires: dvipng %if 0%{?fedora} >= 18 Requires: stix-math-fonts %else @@ -360,14 +359,8 @@ fi sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py %endif -# Remove references to bundled libraries -%patch0 -b .noagg -%patch1 -b .cxx %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 -%patch6 -p1 chmod -x lib/matplotlib/mpl-data/images/*.svg @@ -438,9 +431,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %files -n python2-matplotlib %license LICENSE/ -%doc README.rst +%doc CONTRIBUTING.md %doc CHANGELOG -%doc PKG-INFO +%doc README.rst %{python2_sitearch}/*egg-info %{python2_sitearch}/matplotlib-*-nspkg.pth %{python2_sitearch}/matplotlib/ @@ -508,9 +501,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %if %{with_python3} %files -n python3-matplotlib %license LICENSE/ -%doc README.rst +%doc CONTRIBUTING.md %doc CHANGELOG -%doc PKG-INFO +%doc README.rst %{python3_sitearch}/*egg-info %{python3_sitearch}/matplotlib-*-nspkg.pth %{python3_sitearch}/matplotlib/ @@ -557,6 +550,13 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %endif %changelog +* Mon Apr 04 2016 Thomas Spura - 1.5.1-1 +- update to 1.5.1 (#1276806) +- Add missing requires of dvipng to python3-matplotlib (#1270202) +- use bundled agg (#1276806) +- Drop cxx patch (was dropped upstream) +- Regenerate search path patch2 + * Mon Apr 04 2016 Thomas Spura - 1.4.3-13 - Require the qt5 subpackage from the qt4 subpackage (#1219556)