Update to latest version (#2139597)
This commit is contained in:
Elliott Sales de Andrade
parent
06a8e578fd
commit
fbc57eefdb
1
.gitignore
vendored
1
.gitignore
vendored
@ -88,3 +88,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/matplotlib-3.6.0-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.1.tar.gz
|
||||
/matplotlib-3.6.1-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.2.tar.gz
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 27351b482a702cab3305368294936b531c9fc649 Mon Sep 17 00:00:00 2001
|
||||
From 3e43f06eaad8cdb48d30b4cbe23a881c6fa5c1ff 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/4] matplotlibrc path search fix
|
||||
@ -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 fd78e6f94f..5eae4b50e2 100644
|
||||
index 77d25bbe33..9786447e23 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -540,7 +540,8 @@ def get_cachedir():
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 00c02f0c02e9927d5bf9cab6f7d276d03afad558 Mon Sep 17 00:00:00 2001
|
||||
From c7f6a197992cfd989fddb858afcde5abcdecf70e 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/4] Set FreeType version to 2.12.1 and update tolerances.
|
||||
@ -14,10 +14,10 @@ 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 5eae4b50e2..1e68e9b991 100644
|
||||
index 9786447e23..56266f0688 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1212,7 +1212,7 @@ default_test_modules = [
|
||||
@@ -1213,7 +1213,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`
|
||||
@ -27,10 +27,10 @@ index 5eae4b50e2..1e68e9b991 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 a230af2ac1..9cadbd7975 100644
|
||||
index 8d6466c749..c8604b8657 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -7203,7 +7203,7 @@ def test_normal_axes():
|
||||
@@ -7210,7 +7210,7 @@ def test_normal_axes():
|
||||
]
|
||||
for nn, b in enumerate(bbaxis):
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
|
||||
@ -39,7 +39,7 @@ index a230af2ac1..9cadbd7975 100644
|
||||
|
||||
target = [
|
||||
[150.0, 119.999, 930.0, 11.111],
|
||||
@@ -7221,7 +7221,7 @@ def test_normal_axes():
|
||||
@@ -7228,7 +7228,7 @@ def test_normal_axes():
|
||||
|
||||
target = [85.5138, 75.88888, 1021.11, 1017.11]
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target)
|
||||
@ -49,7 +49,7 @@ index a230af2ac1..9cadbd7975 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 35eb850fcd..31086ae5b7 100644
|
||||
index 64906b74c3..bfa53cd430 100644
|
||||
--- a/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
@@ -431,7 +431,7 @@ def test_hidden_axes():
|
||||
@ -115,7 +115,7 @@ index 1eb7b4b453..697eba3211 100644
|
||||
|
||||
|
||||
diff --git a/setupext.py b/setupext.py
|
||||
index 69835c12f7..79ee6174e1 100644
|
||||
index 0387223b94..13096a812c 100644
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -168,13 +168,23 @@ _freetype_hashes = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f4fb00d01a22ecab946ca335ab0c66ed07a5a920 Mon Sep 17 00:00:00 2001
|
||||
From 0939c27b1d47cabd19c09fc09f15ef4fb18331b4 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/4] Increase a few test tolerances on some arches.
|
||||
@ -12,14 +12,13 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
lib/matplotlib/tests/test_image.py | 4 ++--
|
||||
lib/matplotlib/tests/test_lines.py | 4 +++-
|
||||
lib/matplotlib/tests/test_mathtext.py | 7 +++++--
|
||||
lib/matplotlib/tests/test_streamplot.py | 3 ++-
|
||||
8 files changed, 23 insertions(+), 11 deletions(-)
|
||||
7 files changed, 21 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
|
||||
index 9cadbd7975..3cf2b40d0a 100644
|
||||
index c8604b8657..da72bb9415 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -1025,7 +1025,8 @@ def test_imshow():
|
||||
@@ -1031,7 +1031,8 @@ def test_imshow():
|
||||
ax.imshow("r", data=data)
|
||||
|
||||
|
||||
@ -29,7 +28,7 @@ index 9cadbd7975..3cf2b40d0a 100644
|
||||
def test_imshow_clip():
|
||||
# As originally reported by Gellule Xg <gellule.xg@free.fr>
|
||||
# use former defaults to match existing baseline image
|
||||
@@ -2334,7 +2335,8 @@ def test_contour_hatching():
|
||||
@@ -2340,7 +2341,8 @@ def test_contour_hatching():
|
||||
extend='both', alpha=0.5)
|
||||
|
||||
|
||||
@ -53,7 +52,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 149ed4c3d2..2e1f1ce171 100644
|
||||
index 4336b761f6..7d3927408b 100644
|
||||
--- a/lib/matplotlib/tests/test_colorbar.py
|
||||
+++ b/lib/matplotlib/tests/test_colorbar.py
|
||||
@@ -1,3 +1,5 @@
|
||||
@ -62,7 +61,7 @@ index 149ed4c3d2..2e1f1ce171 100644
|
||||
import numpy as np
|
||||
import pytest
|
||||
|
||||
@@ -231,7 +233,8 @@ def test_colorbar_single_ax_panchor_east(constrained):
|
||||
@@ -233,7 +235,8 @@ def test_colorbar_single_ax_panchor_east(constrained):
|
||||
assert ax.get_anchor() == 'E'
|
||||
|
||||
|
||||
@ -73,10 +72,10 @@ index 149ed4c3d2..2e1f1ce171 100644
|
||||
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 2c76f34cb1..cc6966182f 100644
|
||||
index 8bf77f0d54..82c0b09ac3 100644
|
||||
--- a/lib/matplotlib/tests/test_contour.py
|
||||
+++ b/lib/matplotlib/tests/test_contour.py
|
||||
@@ -318,7 +318,8 @@ def test_contourf_log_extension():
|
||||
@@ -319,7 +319,8 @@ def test_contourf_log_extension():
|
||||
|
||||
|
||||
@image_comparison(['contour_addlines.png'],
|
||||
@ -154,20 +153,6 @@ index 7f8b06fa0e..d7d5e687fe 100644
|
||||
def test_mathfont_rendering(baseline_images, fontset, index, text):
|
||||
mpl.rcParams['mathtext.fontset'] = fontset
|
||||
fig = plt.figure(figsize=(5.25, 0.75))
|
||||
diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
|
||||
index 5ee6df09e4..2084457a99 100644
|
||||
--- a/lib/matplotlib/tests/test_streamplot.py
|
||||
+++ b/lib/matplotlib/tests/test_streamplot.py
|
||||
@@ -34,7 +34,8 @@ def test_startpoints():
|
||||
plt.plot(start_x, start_y, 'ok')
|
||||
|
||||
|
||||
-@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20')
|
||||
+@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20',
|
||||
+ tol=0.01)
|
||||
def test_colormap():
|
||||
X, Y, U, V = velocity_field()
|
||||
plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 0a939d7f07eee6b7d869716e916d0f7517158d10 Mon Sep 17 00:00:00 2001
|
||||
From 77d0ef4bac7e14da704556a6f1f99962b0864a6a 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/4] Use old stride_windows implementation on 32-bit x86
|
||||
|
||||
@ -36,8 +36,8 @@
|
||||
%global ftver 2.12.1
|
||||
|
||||
Name: python-matplotlib
|
||||
Version: 3.6.1
|
||||
%global Version 3.6.1
|
||||
Version: 3.6.2
|
||||
%global Version 3.6.2
|
||||
Release: %autorelease
|
||||
Summary: Python 2D plotting library
|
||||
# qt_editor backend is MIT
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (matplotlib-3.6.1.tar.gz) = 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b
|
||||
SHA512 (matplotlib-3.6.2.tar.gz) = 51b84a4328a85f674cb44728955fca8bb5b8b702c788158b8bcfc13a44206a5a658ac12ed8f9a5f6ec53ef543395fab4f3871f91013ba1432f3e2b848c36976f
|
||||
SHA512 (matplotlib-3.6.1-with-freetype-2.12.1.tar.gz) = 9210cfe8db2743519188d924dfd5f4ec4a0b5ae589b8a596f5a35b900234fa3a2fe81a047fc486ec69359259685438f4c19bb96a63ca0f544d2f48fbabb1326e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user