Update to latest version (#2230778)

This commit is contained in:
Elliott Sales de Andrade 2023-09-16 00:57:57 -04:00
parent 52ef239853
commit b10c4c84d1
8 changed files with 18 additions and 50 deletions

4
.gitignore vendored
View File

@ -90,8 +90,6 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-3.6.1-with-freetype-2.12.1.tar.gz
/matplotlib-3.6.2.tar.gz
/matplotlib-3.6.3.tar.gz
/pgf_pdflatex.pdf
/pgf_rcupdate2.pdf
/matplotlib-3.7.0rc1.tar.gz
/matplotlib-3.7.0rc1-with-freetype-2.12.1.tar.gz
/matplotlib-3.7.0.tar.gz
@ -102,3 +100,5 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-3.7.2-with-freetype-2.13.1.tar.gz
/matplotlib-3.8.0rc1.tar.gz
/matplotlib-3.8.0rc1-with-freetype-2.13.1.tar.gz
/matplotlib-3.8.0.tar.gz
/matplotlib-3.8.0-with-freetype-2.13.1.tar.gz

View File

@ -1,4 +1,4 @@
From 8316721d7a203dd5b170c56e0ceb541296d8f67a Mon Sep 17 00:00:00 2001
From ad95c0abec7677bc256b5a1fc198c16c4539a6d0 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

View File

@ -1,4 +1,4 @@
From 23f561e7b578806239bb3c68ed9ef02aa1e00ce4 Mon Sep 17 00:00:00 2001
From 9a1f728c8f56aaa1961cc9690e169ae5e31054d5 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 11 Aug 2023 02:36:06 -0400
Subject: [PATCH 2/5] Unpin NumPy build requirement

View File

@ -1,4 +1,4 @@
From d51586f7ab846719df9b4dfc2891178e53bf6d20 Mon Sep 17 00:00:00 2001
From bddeb2a46d7d6e706675c3a4959403825b36fc7b 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 3/5] Set FreeType version to 2.13.1 and update tolerances
@ -29,10 +29,10 @@ index 324b9bcabd..133dc73548 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 ac9dd0787a..c9687914c8 100644
index 30992d5780..348181e67f 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -7612,7 +7612,7 @@ def test_normal_axes():
@@ -7621,7 +7621,7 @@ def test_normal_axes():
]
for nn, b in enumerate(bbaxis):
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
@ -41,7 +41,7 @@ index ac9dd0787a..c9687914c8 100644
target = [
[150.0, 119.999, 930.0, 11.111],
@@ -7630,7 +7630,7 @@ def test_normal_axes():
@@ -7639,7 +7639,7 @@ def test_normal_axes():
target = [85.5138, 75.88888, 1021.11, 1017.11]
targetbb = mtransforms.Bbox.from_bounds(*target)

View File

@ -1,4 +1,4 @@
From 559b5ed0f440480231d652313a5c5d1e64dfee44 Mon Sep 17 00:00:00 2001
From c564f0d02e2b7c2228eeab9050d8d92209c6a3df Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Mon, 22 Aug 2022 18:43:28 -0400
Subject: [PATCH 4/5] Use old stride_windows implementation on 32-bit x86

View File

@ -1,50 +1,18 @@
From b224df2d58bd6335d24ec185e85348c893c076c3 Mon Sep 17 00:00:00 2001
From d429c3d4b548a976bc9eac437fca09fdfe784fa8 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 11 Aug 2023 05:13:38 -0400
Subject: [PATCH 5/5] TST: Increase some tolerances for non-x86 arches
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/tests/test_axes.py | 2 +-
lib/mpl_toolkits/mplot3d/tests/test_axes3d.py | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
lib/mpl_toolkits/mplot3d/tests/test_axes3d.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index c9687914c8..3a6edde772 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -2502,7 +2502,7 @@ def test_contour_hatching():
@image_comparison(
['contour_colorbar'], style='mpl20',
- tol=0.02 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
+ tol=0.54 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
def test_contour_colorbar():
x, y, z = contour_dat()
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
index ad04b12526..5970132095 100644
index 1f8764cbab..c998e929a9 100644
--- a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
+++ b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
@@ -1,5 +1,6 @@
import functools
import itertools
+import platform
import pytest
@@ -217,7 +218,9 @@ def test_bar3d_lightsource():
np.testing.assert_array_max_ulp(color, collection._facecolor3d[1::6], 4)
-@mpl3d_image_comparison(['contour3d.png'], style='mpl20')
+@mpl3d_image_comparison(
+ ['contour3d.png'], style='mpl20',
+ tol=0.002 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
def test_contour3d():
fig = plt.figure()
ax = fig.add_subplot(projection='3d')
@@ -2246,7 +2249,7 @@ def test_scatter_masked_color():
@@ -2249,7 +2249,7 @@ def test_scatter_masked_color():
len(super(type(path3d), path3d).get_facecolors())

View File

@ -30,13 +30,13 @@
%global _docdir_fmt %{name}
# Updated test images for new FreeType.
%global mpl_images_version 3.8.0rc1
%global mpl_images_version 3.8.0
# The version of FreeType in this Fedora branch.
%global ftver 2.13.1
Name: python-matplotlib
Version: 3.8.0~rc1
Version: 3.8.0
%global Version %{version_no_tilde %{quote:%nil}}
Release: %autorelease
Summary: Python 2D plotting library

View File

@ -1,2 +1,2 @@
SHA512 (matplotlib-3.8.0rc1.tar.gz) = c62283e5baa1a7f6ae9a60f82b1d5ffae5b20d230e48ea8db9c299f5559286ae59134fcaf8e96bdaba1a59f6707793e5a53ff45c78c2a30e16277fb3b2dd21de
SHA512 (matplotlib-3.8.0rc1-with-freetype-2.13.1.tar.gz) = 4e2fa4f8433076929254007ada4c38c9fb24deba11f7e0e0af06e430882fe127198afd9d03ef6f33ee12dec37ef912bd27045697e47b74ed946644f7fe9c679e
SHA512 (matplotlib-3.8.0.tar.gz) = 0f75495210946adf0a36af13a75bc9910d345cc05636019952f35856b4c2bfac8a79c48d5a3348e844cfdac797f3ce490fe6a4e1a4fc7033092fee61f9913e21
SHA512 (matplotlib-3.8.0-with-freetype-2.13.1.tar.gz) = 8ef9ce2915d125b09a31bc692c7af740038bfbb05b4f7e6a03927e0c856fd7e5af2a08d3a6f533d83fe97ec73a7620da3ac0d6f49729162a3b588b51186e2794