peeweep/python-matplotlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update test tolerances for other architectures

Browse Source
This commit is contained in:
Elliott Sales de Andrade
2021-12-14 04:53:06 -05:00
parent 4c568cf6a5
commit 48535648bd
4 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0001-matplotlibrc-path-search-fix.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From 4039d6d10c679aa5c9a3268fbea663e05acf50d3 Mon Sep 17 00:00:00 2001
From 134f23fc6b79898d23fd587e6c5a20f554263630 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 27 Sep 2017 19:35:59 -0400
Subject: [PATCH 1/5] matplotlibrc path search fix
Subject: [PATCH 1/4] matplotlibrc path search fix
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
0002-Set-FreeType-version-to-2.11.0-and-update-tolerances.patch
+11 -11
View File
@@ -1,7 +1,7 @@
From 0779db3fa70c58e88e048bec9b738ae02fccaead 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/5] Set FreeType version to 2.11.0 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>
---
@@ -28,10 +28,10 @@ index bc800e1322..10ff904c8e 100644
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
index 39b2478637..98878513b5 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -6556,7 +6556,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])
@@ -40,7 +40,7 @@ index 2d6c1deed4..472e0e6902 100644
target = [
[150.0, 119.999, 930.0, 11.111],
@@ -6574,7 +6574,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)
@@ -50,7 +50,7 @@ index 2d6c1deed4..472e0e6902 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 a8222a73d5..ea007a233f 100644
index a717eace83..64b9262143 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -411,7 +411,7 @@ def test_hidden_axes():
@@ -63,7 +63,7 @@ index a8222a73d5..ea007a233f 100644
def test_colorbar_align():
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
index 0055d54a03..09a8005e50 100644
index 80d989922c..c7cbd969b1 100644
--- a/lib/matplotlib/tests/test_mathtext.py
+++ b/lib/matplotlib/tests/test_mathtext.py
@@ -1,5 +1,6 @@
@@ -94,7 +94,7 @@ index 0055d54a03..09a8005e50 100644
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 ea3cdfa129..d6cc018d5d 100644
index 85aece5fce..9fea856af4 100644
--- a/lib/matplotlib/tests/test_polar.py
+++ b/lib/matplotlib/tests/test_polar.py
@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
@@ -107,7 +107,7 @@ index ea3cdfa129..d6cc018d5d 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():
@@ -129,7 +129,7 @@ index 23d363b508..e94c863477 100644
diff --git a/setupext.py b/setupext.py
index 0d85f479d1..42d6fbe2ca 100644
index e41ab98fe1..ff7f45d804 100644
--- a/setupext.py
+++ b/setupext.py
@@ -167,12 +167,18 @@ _freetype_hashes = {
@@ -152,7 +152,7 @@ index 0d85f479d1..42d6fbe2ca 100644
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):
@@ -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'))
0003-Slightly-increase-tolerance-on-rcupdate-test.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From af387ba8868b761273dc85b288196822ebba345c Mon Sep 17 00:00:00 2001
From 77ff08e47935f5ea307eb9fd69ca08a774f264f7 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 4 Jun 2021 02:32:31 -0400
Subject: [PATCH 3/5] Slightly increase tolerance on rcupdate test.
Subject: [PATCH 3/4] Slightly increase tolerance on rcupdate test.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
0004-Increase-a-few-test-tolerances-on-some-arches.patch
+32 -11
View File
@@ -1,22 +1,23 @@
From ce44fc4f778f3e7d781f5d812e86b10dff2ee1fc Mon Sep 17 00:00:00 2001
From 715490fce1f7a2579f620802bbf25d525b5f2e7c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 24 Aug 2021 04:47:50 -0400
Subject: [PATCH 4/5] Increase a few test tolerances on some arches.
Subject: [PATCH 4/4] Increase a few test tolerances on some arches.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/tests/test_axes.py | 6 ++++--
lib/matplotlib/tests/test_colorbar.py | 5 ++++-
lib/matplotlib/tests/test_contour.py | 3 ++-
lib/matplotlib/tests/test_image.py | 4 ++--
lib/matplotlib/tests/test_lines.py | 4 +++-
lib/matplotlib/tests/test_streamplot.py | 3 ++-
5 files changed, 13 insertions(+), 7 deletions(-)
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index 472e0e6902..a5e678d048 100644
index 98878513b5..890f1de85d 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -868,7 +868,8 @@ def test_imshow():
@@ -890,7 +890,8 @@ def test_imshow():
ax.imshow("r", data=data)
@@ -26,7 +27,7 @@ index 472e0e6902..a5e678d048 100644
def test_imshow_clip():
# As originally reported by Gellule Xg <gellule.xg@free.fr>
# use former defaults to match existing baseline image
@@ -2060,7 +2061,8 @@ def test_contour_hatching():
@@ -2083,7 +2084,8 @@ def test_contour_hatching():
extend='both', alpha=0.5)
@@ -36,11 +37,31 @@ index 472e0e6902..a5e678d048 100644
def test_contour_colorbar():
x, y, z = contour_dat()
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
index 0fd049655a..65dbb6410e 100644
--- a/lib/matplotlib/tests/test_colorbar.py
+++ b/lib/matplotlib/tests/test_colorbar.py
@@ -1,3 +1,5 @@
+import platform
+
import numpy as np
import pytest
@@ -186,7 +188,8 @@ def test_colorbar_positioning(use_gridspec):
anchor=(0.8, 0.5), shrink=0.6, use_gridspec=use_gridspec)
-@image_comparison(['contour_colorbar.png'], remove_text=True)
+@image_comparison(['contour_colorbar.png'], remove_text=True,
+ tol=0 if platform.machine() == 'x86_64' else 0.01)
def test_contour_colorbar():
fig, ax = plt.subplots(figsize=(4, 2))
data = np.arange(1200).reshape(30, 40) - 500
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
index 6396105f12..ea13615e4b 100644
index 5d887416a4..c0a652f5d5 100644
--- a/lib/matplotlib/tests/test_contour.py
+++ b/lib/matplotlib/tests/test_contour.py
@@ -341,7 +341,8 @@ def test_contourf_log_extension():
@@ -345,7 +345,8 @@ def test_contourf_log_extension():
@image_comparison(['contour_addlines.png'],
@@ -51,10 +72,10 @@ index 6396105f12..ea13615e4b 100644
# colorbars was cleaned up...
def test_contour_addlines():
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
index 2c4a2763e4..b41bca0863 100644
index 719b190578..860a2444df 100644
--- a/lib/matplotlib/tests/test_image.py
+++ b/lib/matplotlib/tests/test_image.py
@@ -1322,8 +1322,8 @@ def test_nonuniform_and_pcolor():
@@ -1323,8 +1323,8 @@ def test_nonuniform_and_pcolor():
ax.set(xlim=(0, 10))
@@ -88,7 +109,7 @@ index f6917a134b..a7b5772e8c 100644
fig, ax = plt.subplots()
np.random.seed(0)
diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
index 88c3ec2768..3e0c8a76ab 100644
index c846ecfdcb..c04b086784 100644
--- a/lib/matplotlib/tests/test_streamplot.py
+++ b/lib/matplotlib/tests/test_streamplot.py
@@ -34,7 +34,8 @@ def test_startpoints():