Update to latest release candidate (#2119958)
This commit is contained in:
Elliott Sales de Andrade
parent
704b8e1dc2
commit
8b94e4ad13
2
.gitignore
vendored
2
.gitignore
vendored
@ -82,3 +82,5 @@ matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/matplotlib-3.5.3-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.0rc1.tar.gz
|
||||
/matplotlib-3.6.0rc1-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.0rc2.tar.gz
|
||||
/matplotlib-3.6.0rc2-with-freetype-2.12.1.tar.gz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c006ef7296abee22c3ec4ae1f3ee79bfa903471f Mon Sep 17 00:00:00 2001
|
||||
From 27351b482a702cab3305368294936b531c9fc649 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>
|
||||
---
|
||||
@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 50033b212a..8639a44283 100644
|
||||
index fd78e6f94f..5eae4b50e2 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -540,7 +540,8 @@ def get_cachedir():
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From dba1a25bb3cbe2d3dba3199401ab576621f060c2 Mon Sep 17 00:00:00 2001
|
||||
From 00c02f0c02e9927d5bf9cab6f7d276d03afad558 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.12.1 and update tolerances.
|
||||
Subject: [PATCH 2/4] Set FreeType version to 2.12.1 and update tolerances.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
@ -14,7 +14,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
6 files changed, 25 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 8639a44283..9a3e684e77 100644
|
||||
index 5eae4b50e2..1e68e9b991 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1212,7 +1212,7 @@ default_test_modules = [
|
||||
@ -27,10 +27,10 @@ index 8639a44283..9a3e684e77 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 268eb957f4..415de0c594 100644
|
||||
index a230af2ac1..9cadbd7975 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -7152,7 +7152,7 @@ def test_normal_axes():
|
||||
@@ -7203,7 +7203,7 @@ def test_normal_axes():
|
||||
]
|
||||
for nn, b in enumerate(bbaxis):
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
|
||||
@ -39,7 +39,7 @@ index 268eb957f4..415de0c594 100644
|
||||
|
||||
target = [
|
||||
[150.0, 119.999, 930.0, 11.111],
|
||||
@@ -7170,7 +7170,7 @@ def test_normal_axes():
|
||||
@@ -7221,7 +7221,7 @@ def test_normal_axes():
|
||||
|
||||
target = [85.5138, 75.88888, 1021.11, 1017.11]
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c9f76906518c87a88d006c755b5a0765a8841a12 Mon Sep 17 00:00:00 2001
|
||||
From f4fb00d01a22ecab946ca335ab0c66ed07a5a920 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 3/5] Increase a few test tolerances on some arches.
|
||||
Subject: [PATCH 3/4] Increase a few test tolerances on some arches.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
@ -16,10 +16,10 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
8 files changed, 23 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
|
||||
index 415de0c594..c3a14e84d7 100644
|
||||
index 9cadbd7975..3cf2b40d0a 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -974,7 +974,8 @@ def test_imshow():
|
||||
@@ -1025,7 +1025,8 @@ def test_imshow():
|
||||
ax.imshow("r", data=data)
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ index 415de0c594..c3a14e84d7 100644
|
||||
def test_imshow_clip():
|
||||
# As originally reported by Gellule Xg <gellule.xg@free.fr>
|
||||
# use former defaults to match existing baseline image
|
||||
@@ -2283,7 +2284,8 @@ def test_contour_hatching():
|
||||
@@ -2334,7 +2335,8 @@ def test_contour_hatching():
|
||||
extend='both', alpha=0.5)
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ index 482bc073a7..ab16d9736c 100644
|
||||
mpl.rcParams.update({'font.family': 'serif', 'pgf.rcfonts': False})
|
||||
Y, X = np.ogrid[-1:1:40j, -1:1:40j]
|
||||
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
|
||||
index c1faef435f..56cc7d6a8b 100644
|
||||
index 149ed4c3d2..2e1f1ce171 100644
|
||||
--- a/lib/matplotlib/tests/test_colorbar.py
|
||||
+++ b/lib/matplotlib/tests/test_colorbar.py
|
||||
@@ -1,3 +1,5 @@
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 5d031f83fb390151739c32072951c7325821aadf Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 22 Aug 2022 16:06:15 -0400
|
||||
Subject: [PATCH 4/5] Loosen up test_Normalize test
|
||||
|
||||
Fixes #23707
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/tests/test_colors.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
|
||||
index 30f28fc67a..4a098ef068 100644
|
||||
--- a/lib/matplotlib/tests/test_colors.py
|
||||
+++ b/lib/matplotlib/tests/test_colors.py
|
||||
@@ -567,7 +567,7 @@ def test_Normalize():
|
||||
norm = plt.Normalize(1, 1 + 100 * eps)
|
||||
# This returns exactly 0.5 when longdouble is extended precision (80-bit),
|
||||
# but only a value close to it when it is quadruple precision (128-bit).
|
||||
- np.testing.assert_array_almost_equal_nulp(norm(1 + 50 * eps), 0.5)
|
||||
+ assert_array_almost_equal(norm(1 + 50 * eps), 0.5, decimal=3)
|
||||
|
||||
|
||||
def test_FuncNorm():
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c35382d801eb981755faab8e48c629c1e428202e Mon Sep 17 00:00:00 2001
|
||||
From 0a939d7f07eee6b7d869716e916d0f7517158d10 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 5/5] Use old stride_windows implementation on 32-bit x86
|
||||
Subject: [PATCH 4/4] Use old stride_windows implementation on 32-bit x86
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
@ -30,14 +30,14 @@
|
||||
%global _docdir_fmt %{name}
|
||||
|
||||
# Updated test images for new FreeType.
|
||||
%global mpl_images_version 3.6.0rc1
|
||||
%global mpl_images_version 3.6.0rc2
|
||||
|
||||
# The version of FreeType in this Fedora branch.
|
||||
%global ftver 2.12.1
|
||||
|
||||
Name: python-matplotlib
|
||||
Version: 3.6.0~rc1
|
||||
%global Version 3.6.0rc1
|
||||
Version: 3.6.0~rc2
|
||||
%global Version 3.6.0rc2
|
||||
Release: %autorelease
|
||||
Summary: Python 2D plotting library
|
||||
# qt_editor backend is MIT
|
||||
@ -57,10 +57,8 @@ Patch1001: 0001-matplotlibrc-path-search-fix.patch
|
||||
Patch1002: 0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
|
||||
Patch1003: 0003-Increase-a-few-test-tolerances-on-some-arches.patch
|
||||
|
||||
# https://github.com/matplotlib/matplotlib/issues/23707
|
||||
Patch0001: 0004-Loosen-up-test_Normalize-test.patch
|
||||
# https://github.com/matplotlib/matplotlib/pull/21190#issuecomment-1223271888
|
||||
Patch0002: 0005-Use-old-stride_windows-implementation-on-32-bit-x86.patch
|
||||
Patch0001: 0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
@ -300,7 +298,6 @@ cp -p %{SOURCE1} mplsetup.cfg
|
||||
|
||||
# Backports or reported upstream
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
|
||||
|
||||
%generate_buildrequires
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (matplotlib-3.6.0rc1.tar.gz) = 0e8898851ccce6523c8cac7f7adda064642384af44a54ef8f95cc34eef2a402c958a107a94598a8f1bd7dba77fb8c383d429edfb9561f1ae91c7fac1d640c342
|
||||
SHA512 (matplotlib-3.6.0rc1-with-freetype-2.12.1.tar.gz) = 9dc92e8a7ad4af107ddaf9af153cdfe912664686f941d93ab1bfedcb53b73ac08307aa274fa50c0569ee53d5dcf5b8472ae8bf8507d65a50a0d65894b3ff3219
|
||||
SHA512 (matplotlib-3.6.0rc2.tar.gz) = 2256692783d9a5a11018479d52958a896329900d338ee3f98ca52831372049c9e2d19a79375a5419e6b52d56eb01194af360ab828ca953fa68d313e0ae5a20ab
|
||||
SHA512 (matplotlib-3.6.0rc2-with-freetype-2.12.1.tar.gz) = 03725023fe53506f9e9a17731b5cfa4dd7faefffa7fab4849bc053fea5078dd406c03939aa4ebc04ec2195efa9f76051a66fed0c5691c835f022b4c5dad2cddb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user