$ git diff --patch-with-stat --summary a139d386f6dbd378e6c6f258f989f550f0f77cd8..5b9da628f25499775c0c3f9a7005f3bbf9989c41
.abf.yml | 2 +-
...e-version-to-2.10.4-and-update-tolerances.patch | 89 ++++++++++++++++------
python-matplotlib.spec | 4 +-
3 files changed, 68 insertions(+), 27 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index a3ff61d..fc4ca4a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- matplotlib-3.4.2.tar.gz: 40886f7192dfc944d9d12980085e70241c8a2a85
+ matplotlib-3.5.1.tar.gz: ee6435a98f23661df4a289b32cedfd2c604739a2
diff --git a/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch b/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch
index c42b819..f96be94 100644
--- a/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch
+++ b/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch
@@ -1,36 +1,37 @@
-From 69ecaadda7a7f59130056458ce9ca6a231aebf5a Mon Sep 17 00:00:00 2001
+From 3e06485b38ce4059ac3019a521e6efa446a24d5d Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 14 Feb 2020 06:05:42 -0500
-Subject: [PATCH 2/4] Set FreeType version to 2.10.4 and update tolerances.
+Subject: [PATCH 2/4] Set FreeType version to 2.11.0 and update tolerances.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/__init__.py | 2 +-
lib/matplotlib/tests/test_axes.py | 4 ++--
lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
+ lib/matplotlib/tests/test_mathtext.py | 7 +++++--
lib/matplotlib/tests/test_polar.py | 2 +-
lib/matplotlib/tests/test_tightlayout.py | 10 +++++-----
- setupext.py | 6 +++++-
- 6 files changed, 15 insertions(+), 11 deletions(-)
+ setupext.py | 9 ++++++++-
+ 7 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 9d795f65f5..5755ad73da 100644
+index bc800e1322..10ff904c8e 100644
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
-@@ -1137,7 +1137,7 @@ default_test_modules = [
+@@ -1201,7 +1201,7 @@ default_test_modules = [
def _init_tests():
# The version of FreeType to install locally for running the
# tests. This must match the value in `setupext.py`
- LOCAL_FREETYPE_VERSION = '2.6.1'
-+ LOCAL_FREETYPE_VERSION = '2.10.4'
++ LOCAL_FREETYPE_VERSION = '2.11.0'
from matplotlib import ft2font
if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index ec4773d465..d63c200b1b 100644
+index 39b2478637..98878513b5 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
-@@ -6500,7 +6500,7 @@ def test_normal_axes():
+@@ -6594,7 +6594,7 @@ def test_normal_axes():
]
for nn, b in enumerate(bbaxis):
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
@@ -39,7 +40,7 @@ index ec4773d465..d63c200b1b 100644
target = [
[150.0, 119.999, 930.0, 11.111],
-@@ -6518,7 +6518,7 @@ def test_normal_axes():
+@@ -6612,7 +6612,7 @@ def test_normal_axes():
target = [85.5138, 75.88888, 1021.11, 1017.11]
targetbb = mtransforms.Bbox.from_bounds(*target)
@@ -49,10 +50,10 @@ index ec4773d465..d63c200b1b 100644
# test that get_position roundtrips to get_window_extent
axbb = ax.get_position().transformed(fig.transFigure).bounds
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index 67474628e7..d3e9d105dc 100644
+index a717eace83..64b9262143 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -429,7 +429,7 @@ def test_hidden_axes():
+@@ -411,7 +411,7 @@ def test_hidden_axes():
extents1 = np.copy(axs[0, 0].get_position().extents)
np.testing.assert_allclose(
@@ -61,11 +62,42 @@ index 67474628e7..d3e9d105dc 100644
def test_colorbar_align():
+diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
+index 80d989922c..c7cbd969b1 100644
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -1,5 +1,6 @@
+ import io
+ from pathlib import Path
++import platform
+ import re
+ import shlex
+ from xml.etree import ElementTree as ET
+@@ -191,7 +192,8 @@ def baseline_images(request, fontset, index, text):
+ @pytest.mark.parametrize(
+ 'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
+ @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
+-@image_comparison(baseline_images=None)
++@image_comparison(baseline_images=None,
++ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
+ def test_mathtext_rendering(baseline_images, fontset, index, text):
+ mpl.rcParams['mathtext.fontset'] = fontset
+ fig = plt.figure(figsize=(5.25, 0.75))
+@@ -215,7 +217,8 @@ def test_mathtext_rendering_lightweight(baseline_images, fontset, index, text):
+ @pytest.mark.parametrize(
+ 'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
+ @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
+-@image_comparison(baseline_images=None, extensions=['png'])
++@image_comparison(baseline_images=None, extensions=['png'],
++ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
+ def test_mathfont_rendering(baseline_images, fontset, index, text):
+ mpl.rcParams['mathtext.fontset'] = fontset
+ fig = plt.figure(figsize=(5.25, 0.75))
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
-index c614eff027..daf4e26fb8 100644
+index 85aece5fce..9fea856af4 100644
--- a/lib/matplotlib/tests/test_polar.py
+++ b/lib/matplotlib/tests/test_polar.py
-@@ -312,7 +312,7 @@ def test_get_tightbbox_polar():
+@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
fig.canvas.draw()
bb = ax.get_tightbbox(fig.canvas.get_renderer())
assert_allclose(
@@ -75,7 +107,7 @@ index c614eff027..daf4e26fb8 100644
@check_figures_equal(extensions=["png"])
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
-index 23d363b508..e94c863477 100644
+index e9b01b160d..beab853489 100644
--- a/lib/matplotlib/tests/test_tightlayout.py
+++ b/lib/matplotlib/tests/test_tightlayout.py
@@ -172,12 +172,12 @@ def test_outward_ticks():
@@ -97,10 +129,10 @@ index 23d363b508..e94c863477 100644
diff --git a/setupext.py b/setupext.py
-index d8d0b6b393..aabb7ed9fd 100644
+index e41ab98fe1..ff7f45d804 100644
--- a/setupext.py
+++ b/setupext.py
-@@ -167,12 +167,16 @@ _freetype_hashes = {
+@@ -167,12 +167,18 @@ _freetype_hashes = {
'955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
'2.10.1':
'3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
@@ -108,16 +140,25 @@ index d8d0b6b393..aabb7ed9fd 100644
+ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
+ '2.10.4':
+ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
++ '2.11.0':
++ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
}
- # This is the version of FreeType to use when building a local
- # version. It must match the value in
- # lib/matplotlib.__init__.py and also needs to be changed below in the
- # embedded windows build script (grep for "REMINDER" in this file)
+ # This is the version of FreeType to use when building a local version. It
+ # must match the value in lib/matplotlib.__init__.py and also needs to be
+ # changed below in the embedded windows build script (grep for "REMINDER" in
+ # this file). Also update the cache path in `.circleci/config.yml`.
-LOCAL_FREETYPE_VERSION = '2.6.1'
-+LOCAL_FREETYPE_VERSION = '2.10.4'
++LOCAL_FREETYPE_VERSION = '2.11.0'
LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
- LOCAL_QHULL_VERSION = '2020.2'
+ # Also update the cache path in `.circleci/config.yml`.
+@@ -581,6 +587,7 @@ class FreeType(SetupPackage):
+ ext.extra_objects.insert(
+ 0, str(src_path / 'objs' / '.libs' / libfreetype))
+ ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
++ ext.libraries.append('brotlidec')
+
+ def do_custom_build(self, env):
+ # We're using a system freetype
--
2.31.1
-
diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index 9aedfe2..cd1f86a 100644
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -14,7 +14,7 @@
Summary: Python 2D plotting library
Name: python-%{module}
-Version: 3.4.2
+Version: 3.5.1
Release: 2
Group: Development/Python
License: Python license
@@ -41,6 +41,7 @@ BuildRequires: python-numpy-devel >= 1.1.0
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(freetype2)
#BuildRequires: pkgconfig(libagg)
+BuildRequires: pkgconfig(libbrotlidec)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(tcl)
BuildRequires: pkgconfig(tk)
@@ -240,7 +241,6 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python_sitearch} \
%{python_sitearch}/%{module}/
%{python_sitearch}/mpl_toolkits/
%{python_sitearch}/pylab.py*
-%{python_sitearch}/__pycache__/*
%exclude %{py_platsitedir}/%{module}/backends/backend_cairo.py*
%exclude %{py_platsitedir}/%{module}/backends/backend_gtk3.py*
%exclude %{py_platsitedir}/%{module}/backends/backend_gtk3agg.py*