Date: Saturday, October 29, 2022 @ 20:03:05 Author: arojas Revision: 1339325
upgpkg: python-matplotlib 3.6.1-1: Update to 3.6.1 Modified: python-matplotlib/trunk/PKGBUILD python-matplotlib/trunk/freetype.patch ----------------+ PKGBUILD | 14 ++++++---- freetype.patch | 75 ++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 62 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-29 19:38:46 UTC (rev 1339324) +++ PKGBUILD 2022-10-29 20:03:05 UTC (rev 1339325) @@ -6,7 +6,7 @@ # Contributor: Douglas Soares de Andrade <[email protected]> pkgname=python-matplotlib -pkgver=3.5.2 +pkgver=3.6.1 pkgrel=1 pkgdesc="A python plotting library, making publication quality plots" arch=(x86_64) @@ -35,14 +35,16 @@ texlive-bin texlive-core texlive-latexextra texlive-pictures ghostscript inkscape ffmpeg imagemagick gtk4 python-cairo python-cairocffi python-gobject python-pyqt5 pyside2 python-pyqt6 pyside6 python-tornado python-wxpython tk jupyter-nbconvert jupyter-nbformat python-ipykernel python-pandas python-pikepdf python-pytz) -_tag=af8c92817e9c1b5cb51bd060ceb99ed956e714c1 # git rev-parse v${pkgver} +_tag=2aad0d94ff80a81cd2e735b46f11f4f4b5e3e59d # git rev-parse v${pkgver} _ftver=2.12.1 source=(git+https://github.com/matplotlib/matplotlib.git#tag=${_tag}?signed https://github.com/QuLogic/mpl-images/archive/v${pkgver}-with-freetype-${_ftver}/mpl-images-${pkgver}-ft${_ftver}.tar.gz - freetype.patch) + freetype.patch + matplotlib-pyside-6.4.patch::https://github.com/matplotlib/matplotlib/commit/c744161b.patch) b2sums=('SKIP' - 'b3dc00bd2e2ffb36e8d61ae570dee19a7bf54155fd91d4dc03b3f0ac439466efddc9564a27c44bb3eb9b46b7505cb4920f35c1a2c74a3ab7396a4b7bbbc6a9be' - '0f41283060ecd070e04efa51b32321f378fbcd50d2fc3105df517f55ea5b0268f2d4494dd742e463c4790fa18ecdac26e6c6ab6adcaa134cda152a523911ece1') + 'b2980e8812bd2ede44e448f70ada23ec3c313fd9d1024daa71320468857546818bbc9461a9f9e511de7c7883d8d810271acc13db6fb36a56f82d60b2ed1ada5e' + 'b821f938cace434932a43b15b42b93d0f8eaffea4e28fbf1d5a7263ec947c26252bafccaea60c1a1cb2fad4c71280ca2cf62527994f270af2467a242287470bb' + 'f85435d7925a3b8300eff92f995d0a43f7bc9db3c078a76a8a6a0eb01be830bf6a72011bb149a12561abf562420c9403094e062be5d2d19623381d5ee717b254') validpgpkeys=(23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10) # Elliott Sales de Andrade <[email protected]> prepare() { @@ -53,6 +55,8 @@ # Use system freetype and qhull sed -e 's|#system_freetype = False|system_freetype = True|' -e 's|#system_qhull = False|system_qhull = True|' mplsetup.cfg.template > mplsetup.cfg patch -p1 < ../freetype.patch # From Fedora/upstream + # Fix tests with PySide 6.4 + patch -p1 < ../matplotlib-pyside-6.4.patch # Install tests for check() sed -i 's|#tests = False|tests = True|' mplsetup.cfg # Use appropriate baseline images for tests Modified: freetype.patch =================================================================== --- freetype.patch 2022-10-29 19:38:46 UTC (rev 1339324) +++ freetype.patch 2022-10-29 20:03:05 UTC (rev 1339325) @@ -1,22 +1,23 @@ -From 200afb4b8503031e1aad437482b2bc61b1cede32 Mon Sep 17 00:00:00 2001 +From 00c02f0c02e9927d5bf9cab6f7d276d03afad558 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade <[email protected]> Date: Fri, 14 Feb 2020 06:05:42 -0500 +Subject: [PATCH 2/4] Set FreeType version to 2.12.1 and update tolerances. Signed-off-by: Elliott Sales de Andrade <[email protected]> --- lib/matplotlib/__init__.py | 2 +- lib/matplotlib/tests/test_axes.py | 4 ++-- - lib/matplotlib/tests/test_constrainedlayout.py | 2 +- + lib/matplotlib/tests/test_constrainedlayout.py | 6 +++--- lib/matplotlib/tests/test_polar.py | 2 +- lib/matplotlib/tests/test_tightlayout.py | 10 +++++----- - setupext.py | 9 +++++++++++++-- - 6 files changed, 23 insertions(+), 12 deletions(-) + setupext.py | 15 +++++++++++++-- + 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index bc800e1322..10ff904c8e 100644 +index 5eae4b50e2..1e68e9b991 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py -@@ -1201,7 +1201,7 @@ default_test_modules = [ +@@ -1212,7 +1212,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` @@ -26,10 +27,10 @@ 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 eb4c34382b..03b92d34fa 100644 +index a230af2ac1..9cadbd7975 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py -@@ -6710,7 +6710,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]) @@ -38,7 +39,7 @@ target = [ [150.0, 119.999, 930.0, 11.111], -@@ -6728,7 +6728,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) @@ -47,8 +48,21 @@ # test that get_position roundtrips to get_window_extent axbb = ax.get_position().transformed(fig.transFigure).bounds +diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py +index 680efd6737..1c1900a443 100644 +--- a/lib/matplotlib/tests/test_backend_svg.py ++++ b/lib/matplotlib/tests/test_backend_svg.py +@@ -74,7 +74,7 @@ def test_bold_font_output(): + ax.set_title('bold-title', fontweight='bold') + + +-@image_comparison(['bold_font_output_with_none_fonttype.svg']) ++@image_comparison(['bold_font_output_with_none_fonttype.svg'], tol=15) + def test_bold_font_output_with_none_fonttype(): + plt.rcParams['svg.fonttype'] = 'none' + fig, ax = plt.subplots() diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py -index 8fd3cc5a35..b1e0fa57cd 100644 +index 35eb850fcd..31086ae5b7 100644 --- a/lib/matplotlib/tests/test_constrainedlayout.py +++ b/lib/matplotlib/tests/test_constrainedlayout.py @@ -431,7 +431,7 @@ def test_hidden_axes(): @@ -60,8 +74,26 @@ def test_colorbar_align(): +@@ -637,7 +637,7 @@ def test_compressed1(): + fig.draw_without_rendering() + + pos = axs[0, 0].get_position() +- np.testing.assert_allclose(pos.x0, 0.2344, atol=1e-3) ++ np.testing.assert_allclose(pos.x0, 0.2344, atol=1e-2) + pos = axs[0, 1].get_position() + np.testing.assert_allclose(pos.x1, 0.7024, atol=1e-3) + +@@ -652,7 +652,7 @@ def test_compressed1(): + + pos = axs[0, 0].get_position() + np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3) +- np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3) ++ np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-2) + pos = axs[1, 2].get_position() + np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3) + np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3) diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py -index 85aece5fce..9fea856af4 100644 +index c51508ae22..942ffcb521 100644 --- a/lib/matplotlib/tests/test_polar.py +++ b/lib/matplotlib/tests/test_polar.py @@ -314,7 +314,7 @@ def test_get_tightbbox_polar(): @@ -74,10 +106,10 @@ @check_figures_equal(extensions=["png"]) diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py -index e9b01b160d..beab853489 100644 +index 1eb7b4b453..697eba3211 100644 --- a/lib/matplotlib/tests/test_tightlayout.py +++ b/lib/matplotlib/tests/test_tightlayout.py -@@ -172,12 +172,12 @@ def test_outward_ticks(): +@@ -173,12 +173,12 @@ def test_outward_ticks(): plt.tight_layout() # These values were obtained after visual checking that they correspond # to a tight layouting that did take the ticks into account. @@ -96,10 +128,10 @@ diff --git a/setupext.py b/setupext.py -index 90bc304531..7ae976b8fa 100644 +index 69835c12f7..79ee6174e1 100644 --- a/setupext.py +++ b/setupext.py -@@ -167,6 +167,16 @@ _freetype_hashes = { +@@ -168,13 +168,23 @@ _freetype_hashes = { '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a', '2.10.1': '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110', @@ -115,18 +147,17 @@ + '2.12.0': + '7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c', + '2.12.1': -+ 'efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938' ++ 'efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938', } -@@ -174,7 +184,7 @@ _freetype_hashes = { - # must match the value in lib/matplotlib.__init__.py and also needs to be - # changed below in the embedded windows build script (grep for "REMINDER" in - # this file). Also update the cache path in `.circleci/config.yml`. + # This is the version of FreeType to use when building a local version. It + # must match the value in lib/matplotlib.__init__.py, and the cache path in + # `.circleci/config.yml`. -TESTING_VERSION_OF_FREETYPE = '2.6.1' +TESTING_VERSION_OF_FREETYPE = '2.12.1' if sys.platform.startswith('win') and platform.machine() == 'ARM64': # older versions of freetype are not supported for win/arm64 # Matplotlib tests will not pass -@@ -590,6 +600,7 @@ class FreeType(SetupPackage): +@@ -584,6 +594,7 @@ class FreeType(SetupPackage): ext.extra_objects.insert( 0, str(src_path / 'objs' / '.libs' / libfreetype)) ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local')) @@ -135,5 +166,5 @@ def do_custom_build(self, env): # We're using a system freetype -- -2.35.1 +2.36.1
