From dbe22df6a2c4f50ced64f725eb4bea821e9ba8d2 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 11 Mar 2021 03:20:23 -0500 Subject: [PATCH] Update to latest release candidate. --- .gitignore | 1 + ...Increase-tolerances-for-other-arches.patch | 66 ------------------- python-matplotlib.spec | 12 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 74 deletions(-) delete mode 100644 0003-Increase-tolerances-for-other-arches.patch diff --git a/.gitignore b/.gitignore index 232cbc7..ba19df7 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-3.3.4.tar.gz /matplotlib-3.4.0rc1.tar.gz /matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz +/matplotlib-3.4.0rc3.tar.gz diff --git a/0003-Increase-tolerances-for-other-arches.patch b/0003-Increase-tolerances-for-other-arches.patch deleted file mode 100644 index 6020f19..0000000 --- a/0003-Increase-tolerances-for-other-arches.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 209dd631c428fba83c66fa03b516e90b65659ed5 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -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 ---- - 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 - diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 4d3369e..5bd01f6 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -47,8 +47,8 @@ %global ftver 2.10.4 Name: python-matplotlib -Version: 3.4.0~rc1 -%global Version 3.4.0rc1 +Version: 3.4.0~rc3 +%global Version 3.4.0rc3 Release: 1%{?dist} Summary: Python 2D plotting library # 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 # Increase tolerances for new FreeType everywhere: 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-c++ @@ -320,9 +318,6 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release} %patch1002 -p1 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 cp -p %{SOURCE1} setup.cfg @@ -468,6 +463,9 @@ PYTHONDONTWRITEBYTECODE=1 \ %changelog +* Thu Mar 11 2021 Elliott Sales de Andrade - 3.4.0~rc3-1 +- Update to latest release candidate + * Fri Feb 19 2021 Elliott Sales de Andrade - 3.4.0~rc1-1 - Update to latest release candidate - Deprecated python3-matplotlib-qt4 subpackage diff --git a/sources b/sources index 52a8315..3d95fe1 100644 --- a/sources +++ b/sources @@ -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