mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
130 lines
5.6 KiB
Diff
130 lines
5.6 KiB
Diff
From 0779db3fa70c58e88e048bec9b738ae02fccaead 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
|
|
|
|
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_polar.py | 2 +-
|
|
lib/matplotlib/tests/test_tightlayout.py | 10 +++++-----
|
|
setupext.py | 9 ++++++++-
|
|
7 files changed, 23 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
|
index bc800e1322..10ff904c8e 100644
|
|
--- a/lib/matplotlib/__init__.py
|
|
+++ b/lib/matplotlib/__init__.py
|
|
@@ -1198,7 +1198,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.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 2d6c1deed4..472e0e6902 100644
|
|
--- a/lib/matplotlib/tests/test_axes.py
|
|
+++ b/lib/matplotlib/tests/test_axes.py
|
|
@@ -6572,7 +6572,7 @@ def test_normal_axes():
|
|
]
|
|
for nn, b in enumerate(bbaxis):
|
|
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
|
|
- assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
|
|
+ assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
|
|
|
|
target = [
|
|
[150.0, 119.999, 930.0, 11.111],
|
|
@@ -6590,7 +6590,7 @@ def test_normal_axes():
|
|
|
|
target = [85.5138, 75.88888, 1021.11, 1017.11]
|
|
targetbb = mtransforms.Bbox.from_bounds(*target)
|
|
- assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
|
|
+ assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
|
|
|
|
# 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 a8222a73d5..ea007a233f 100644
|
|
--- a/lib/matplotlib/tests/test_constrainedlayout.py
|
|
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
|
|
@@ -411,7 +411,7 @@ def test_hidden_axes():
|
|
extents1 = np.copy(axs[0, 0].get_position().extents)
|
|
|
|
np.testing.assert_allclose(
|
|
- extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5)
|
|
+ extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2)
|
|
|
|
|
|
def test_colorbar_align():
|
|
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
|
|
index ea3cdfa129..d6cc018d5d 100644
|
|
--- a/lib/matplotlib/tests/test_polar.py
|
|
+++ b/lib/matplotlib/tests/test_polar.py
|
|
@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
|
|
fig.canvas.draw()
|
|
bb = ax.get_tightbbox(fig.canvas.get_renderer())
|
|
assert_allclose(
|
|
- bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1e-03)
|
|
+ bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1)
|
|
|
|
|
|
@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
|
|
--- a/lib/matplotlib/tests/test_tightlayout.py
|
|
+++ b/lib/matplotlib/tests/test_tightlayout.py
|
|
@@ -172,12 +172,12 @@ def test_outward_ticks():
|
|
plt.tight_layout()
|
|
# These values were obtained after visual checking that they correspond
|
|
# to a tight layouting that did take the ticks into account.
|
|
- ans = [[[0.091, 0.607], [0.433, 0.933]],
|
|
- [[0.579, 0.607], [0.922, 0.933]],
|
|
- [[0.091, 0.140], [0.433, 0.466]],
|
|
- [[0.579, 0.140], [0.922, 0.466]]]
|
|
+ ans = [[[0.09, 0.61], [0.43, 0.93]],
|
|
+ [[0.58, 0.61], [0.92, 0.93]],
|
|
+ [[0.09, 0.14], [0.43, 0.47]],
|
|
+ [[0.58, 0.14], [0.92, 0.47]]]
|
|
for nn, ax in enumerate(fig.axes):
|
|
- assert_array_equal(np.round(ax.get_position().get_points(), 3),
|
|
+ assert_array_equal(np.round(ax.get_position().get_points(), 2),
|
|
ans[nn])
|
|
|
|
|
|
diff --git a/setupext.py b/setupext.py
|
|
index 0d85f479d1..42d6fbe2ca 100644
|
|
--- a/setupext.py
|
|
+++ b/setupext.py
|
|
@@ -167,12 +167,18 @@ _freetype_hashes = {
|
|
'955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
|
|
'2.10.1':
|
|
'3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
|
|
+ '2.10.2':
|
|
+ '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). Also update the cache path in `.circleci/config.yml`.
|
|
-LOCAL_FREETYPE_VERSION = '2.6.1'
|
|
+LOCAL_FREETYPE_VERSION = '2.11.0'
|
|
LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
|
|
|
|
# Also update the cache path in `.circleci/config.yml`.
|
|
@@ -580,6 +586,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
|