Tweak tolerances for ppc64le and s390x.

This commit is contained in:
Elliott Sales de Andrade 2021-08-09 21:40:15 -04:00
parent cbe4b20013
commit 19bce65d7f
7 changed files with 42 additions and 5 deletions

View File

@ -1,7 +1,7 @@
From 6277ea0c008b02cd2abe017d041b43a35a407c6c Mon Sep 17 00:00:00 2001 From 6277ea0c008b02cd2abe017d041b43a35a407c6c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com> From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 27 Sep 2017 19:35:59 -0400 Date: Wed, 27 Sep 2017 19:35:59 -0400
Subject: [PATCH 1/5] matplotlibrc path search fix Subject: [PATCH 1/6] matplotlibrc path search fix
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
--- ---

View File

@ -1,7 +1,7 @@
From 322fe366ece11ae948c7f6ba0191f7dbc5db444b Mon Sep 17 00:00:00 2001 From 322fe366ece11ae948c7f6ba0191f7dbc5db444b Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com> From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 14 Feb 2020 06:05:42 -0500 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/6] Set FreeType version to 2.11.0 and update tolerances.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
--- ---

View File

@ -1,7 +1,7 @@
From d807e4e108073ee0fbda02340b206bf3766d9c7c Mon Sep 17 00:00:00 2001 From d807e4e108073ee0fbda02340b206bf3766d9c7c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com> From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 4 Jun 2021 02:32:31 -0400 Date: Fri, 4 Jun 2021 02:32:31 -0400
Subject: [PATCH 3/5] Slightly increase tolerance on rcupdate test. Subject: [PATCH 3/6] Slightly increase tolerance on rcupdate test.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
--- ---

View File

@ -1,7 +1,7 @@
From ea96e5684af98e28e704dc26f12b793c6032ada6 Mon Sep 17 00:00:00 2001 From ea96e5684af98e28e704dc26f12b793c6032ada6 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com> From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 4 Jun 2021 03:20:38 -0400 Date: Fri, 4 Jun 2021 03:20:38 -0400
Subject: [PATCH 4/5] Use new style for test_text_urls_tex. Subject: [PATCH 4/6] Use new style for test_text_urls_tex.
This test does not depend on the font style, just that the annotation This test does not depend on the font style, just that the annotation
appears over it. Switching to mpl20 style stops using Helvetica, and appears over it. Switching to mpl20 style stops using Helvetica, and

View File

@ -1,7 +1,7 @@
From 982f5255e5da9c5023ca9997aff78c86eb0e8000 Mon Sep 17 00:00:00 2001 From 982f5255e5da9c5023ca9997aff78c86eb0e8000 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com> From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Thu, 24 Jun 2021 01:45:04 -0400 Date: Thu, 24 Jun 2021 01:45:04 -0400
Subject: [PATCH 5/5] Backport PR #20488: FIX: Include 0 when checking lognorm Subject: [PATCH 5/6] Backport PR #20488: FIX: Include 0 when checking lognorm
vmin vmin
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>

View File

@ -0,0 +1,34 @@
From 157025487ba0e446933068c01cd50f2c6691a19a Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Mon, 9 Aug 2021 21:38:15 -0400
Subject: [PATCH 6/6] Increase mathfont test tolerance on some systems.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/tests/test_mathtext.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
index b5fd906d2f..726c226d27 100644
--- a/lib/matplotlib/tests/test_mathtext.py
+++ b/lib/matplotlib/tests/test_mathtext.py
@@ -1,5 +1,6 @@
import io
import os
+import platform
import re
import numpy as np
@@ -189,7 +190,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))
--
2.31.1

View File

@ -71,6 +71,8 @@ Patch1003: 0003-Slightly-increase-tolerance-on-rcupdate-test.patch
Patch1004: 0004-Use-new-style-for-test_text_urls_tex.patch Patch1004: 0004-Use-new-style-for-test_text_urls_tex.patch
# https://github.com/matplotlib/matplotlib/pull/20488 # https://github.com/matplotlib/matplotlib/pull/20488
Patch1005: 0005-Backport-PR-20488-FIX-Include-0-when-checking-lognor.patch Patch1005: 0005-Backport-PR-20488-FIX-Include-0-when-checking-lognor.patch
# Tweak tolerances a bit.
Patch1006: 0006-Increase-mathfont-test-tolerance-on-some-systems.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -329,6 +331,7 @@ cp -p %{SOURCE1} setup.cfg
%patch1003 -p1 %patch1003 -p1
%patch1004 -p1 %patch1004 -p1
%patch1005 -p1 %patch1005 -p1
%patch1006 -p1
%build %build