Update to latest release candidate.

This commit is contained in:
Elliott Sales de Andrade 2021-03-11 03:20:23 -05:00
parent 4ed16b6299
commit dbe22df6a2
4 changed files with 7 additions and 74 deletions

1
.gitignore vendored
View File

@ -60,3 +60,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-3.3.4.tar.gz /matplotlib-3.3.4.tar.gz
/matplotlib-3.4.0rc1.tar.gz /matplotlib-3.4.0rc1.tar.gz
/matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz /matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz
/matplotlib-3.4.0rc3.tar.gz

View File

@ -1,66 +0,0 @@
From 209dd631c428fba83c66fa03b516e90b65659ed5 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 19 Feb 2021 16:33:00 -0500
Subject: [PATCH 3/3] Increase tolerances for other arches.
See scratch build here:
https://koji.fedoraproject.org/koji/taskinfo?taskID=62275793
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/tests/test_arrow_patches.py | 3 ++-
.../tests/test_axisartist_grid_helper_curvelinear.py | 2 +-
lib/mpl_toolkits/tests/test_mplot3d.py | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
index 0eee4f1fba..3c95535e0c 100644
--- a/lib/matplotlib/tests/test_arrow_patches.py
+++ b/lib/matplotlib/tests/test_arrow_patches.py
@@ -114,7 +114,8 @@ def test_fancyarrow_dash():
ax.add_patch(e2)
-@image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True)
+@image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
+ tol=0 if platform.machine() == 'x86_64' else 0.005)
def test_arrow_styles():
styles = mpatches.ArrowStyle.get_styles()
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
index 57397a5962..9a78a2676a 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
@image_comparison(['custom_transform.png'], style='default',
- tol=0.03 if platform.machine() == 'x86_64' else 0.034)
+ tol=0.03 if platform.machine() == 'x86_64' else 0.04)
def test_custom_transform():
class MyTransform(Transform):
input_dims = output_dims = 2
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
index cfcc383db1..f55edaa4aa 100644
--- a/lib/mpl_toolkits/tests/test_mplot3d.py
+++ b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -1,5 +1,6 @@
import functools
import itertools
+import platform
import pytest
@@ -1267,7 +1268,8 @@ def test_errorbar3d():
ax.legend()
-@image_comparison(['stem3d.png'], style='mpl20')
+@image_comparison(['stem3d.png'], style='mpl20',
+ tol=0.0 if platform.machine() == 'x86_64' else 0.003)
def test_stem3d():
fig, axs = plt.subplots(2, 3, figsize=(8, 6),
constrained_layout=True,
--
2.29.2

View File

@ -47,8 +47,8 @@
%global ftver 2.10.4 %global ftver 2.10.4
Name: python-matplotlib Name: python-matplotlib
Version: 3.4.0~rc1 Version: 3.4.0~rc3
%global Version 3.4.0rc1 %global Version 3.4.0rc3
Release: 1%{?dist} Release: 1%{?dist}
Summary: Python 2D plotting library Summary: Python 2D plotting library
# qt4_editor backend is MIT # qt4_editor backend is MIT
@ -66,8 +66,6 @@ Source1000: https://github.com/QuLogic/mpl-images/archive/v%{mpl_images_vers
Patch1001: 0001-matplotlibrc-path-search-fix.patch Patch1001: 0001-matplotlibrc-path-search-fix.patch
# Increase tolerances for new FreeType everywhere: # Increase tolerances for new FreeType everywhere:
Patch1002: 0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch Patch1002: 0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
# https://github.com/matplotlib/matplotlib/pull/19548
Patch0001: 0003-Increase-tolerances-for-other-arches.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -320,9 +318,6 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
%patch1002 -p1 %patch1002 -p1
gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~' gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
# Backports
%patch0001 -p1
# Copy setup.cfg to the builddir # Copy setup.cfg to the builddir
cp -p %{SOURCE1} setup.cfg cp -p %{SOURCE1} setup.cfg
@ -468,6 +463,9 @@ PYTHONDONTWRITEBYTECODE=1 \
%changelog %changelog
* Thu Mar 11 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc3-1
- Update to latest release candidate
* Fri Feb 19 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc1-1 * Fri Feb 19 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc1-1
- Update to latest release candidate - Update to latest release candidate
- Deprecated python3-matplotlib-qt4 subpackage - Deprecated python3-matplotlib-qt4 subpackage

View File

@ -1,2 +1,2 @@
SHA512 (matplotlib-3.4.0rc1.tar.gz) = a5eec56becca26ce8cb4537f08d8575182ebea1cdccf42106ac340a5e371ee723e308369145092176910d5f1fe82002e46344f23d072a9f1d337665e1da460a5 SHA512 (matplotlib-3.4.0rc3.tar.gz) = 7fd9eb39c733b0f866c5d0f638373651b411633d5efee41e73c8c7d73a642180d3686e2184c6a711390284368730d33f61735f97fc41e0608e65f8d086cc9931
SHA512 (matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz) = 331461235474d44d8f180be3b809faa63e0775ef95d0a3fc6b5e83dca2aafca82258b54a393b0f68a4a213b88564afa54444ee8ac040873f06b9b2d53705767b SHA512 (matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz) = 331461235474d44d8f180be3b809faa63e0775ef95d0a3fc6b5e83dca2aafca82258b54a393b0f68a4a213b88564afa54444ee8ac040873f06b9b2d53705767b