Date: Wednesday, December 8, 2021 @ 04:20:22
Author: felixonmars
Revision: 1065605
archrelease: copy trunk to community-staging-x86_64
Added:
python-matplotlib/repos/community-staging-x86_64/PKGBUILD
(from rev 1065604, python-matplotlib/trunk/PKGBUILD)
python-matplotlib/repos/community-staging-x86_64/freetype.patch
(from rev 1065604, python-matplotlib/trunk/freetype.patch)
Deleted:
python-matplotlib/repos/community-staging-x86_64/PKGBUILD
python-matplotlib/repos/community-staging-x86_64/freetype.patch
----------------+
PKGBUILD | 179 +++++++++++++++++++-------------------
freetype.patch | 258 +++++++++++++++++++++++++++----------------------------
2 files changed, 219 insertions(+), 218 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-08 04:20:12 UTC (rev 1065604)
+++ PKGBUILD 2021-12-08 04:20:22 UTC (rev 1065605)
@@ -1,89 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Maintainer: Bruno Pagani <archa...@archlinux.org>
-# Contributor: Stéphane Gaudreault <steph...@archlinux.org>
-# Contributor: Stefan Husmann <stefan-husm...@t-online.de>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org>
-
-pkgname=python-matplotlib
-pkgver=3.5.0
-pkgrel=2
-pkgdesc="A python plotting library, making publication quality plots"
-arch=(x86_64)
-url="https://matplotlib.org";
-license=(custom)
-depends=(freetype2 python-cycler python-dateutil python-fonttools
python-kiwisolver python-numpy
- python-packaging python-pillow python-pyparsing qhull)
-optdepends=('tk: Tk{Agg,Cairo} backends'
- 'pyside2: alternative for Qt5{Agg,Cairo} backends'
- 'pyside6: alternative for Qt6{Agg,Cairo} backends'
- 'python-pyqt5: Qt5{Agg,Cairo} backends'
- 'python-pyqt6: Qt6{Agg,Cairo} backends'
- 'python-gobject: for GTK{3,4}{Agg,Cairo} backend'
- 'python-wxpython: WX{Agg,Cairo} backend'
- 'python-cairo: {GTK{3,4},Qt{5,6},Tk,WX}Cairo backends'
- 'python-cairocffi: alternative for Cairo backends'
- 'python-tornado: WebAgg backend'
- 'ffmpeg: for saving movies'
- 'imagemagick: for saving animated gifs'
- 'ghostscript: usetex dependencies'
- 'texlive-bin: usetex dependencies'
- 'texlive-latexextra: usetex usage with pdflatex'
- 'python-certifi: https support')
-makedepends=(git python-setuptools-scm-git-archive python-certifi)
-checkdepends=(python-pytest python-pytest-xdist python-pytest-runner
python-pytest-rerunfailures xorg-server-xvfb
- 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=7a9ee717ecfa24ae4029abac0c7939076c2b0eb7 # git rev-parse v${pkgver}
-_ftver=2.11.0
-source=(git+https://github.com/matplotlib/matplotlib.git#tag=${_tag}?signed
-
https://github.com/QuLogic/mpl-images/archive/v${pkgver}rc1-with-freetype-${_ftver}/mpl-images-${pkgver}rc1-ft${_ftver}.tar.gz
- freetype.patch)
-b2sums=(SKIP
-
29e87a2dd2fc37c3d33e7e0463ca02b468953abe896ac658a6764e78f61a56bb486f5fec51403b2bda726031c5352b4270049256ac8f630eef56ffb3071b870a
-
514324b3e17e832d5199eaa6592c05ca662b1164ddc95f16ea076d6a1063b06e6a8fa4eac7740e5f73afbcc9d17244c5cc41373d5787f62cd58eab10249302c9)
-validpgpkeys=(23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10) # Elliott Sales de
Andrade <quantum.anal...@gmail.com>
-
-prepare() {
- cd matplotlib
- # Fix SCM detected version
- rm -r .git
- echo "Version: ${pkgver}" > PKG-INFO
- # 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
- # Install tests for check()
- sed -i 's|#tests = False|tests = True|' mplsetup.cfg
- # Use appropriate baseline images for tests
- cp lib/matplotlib/tests/baseline_images/test_image/uint16.tif .
- for _module in matplotlib mpl_toolkits
- do
- rm -r lib/${_module}/tests/baseline_images/test*
- mv ../mpl-images-${pkgver}rc1-with-freetype-${_ftver}/${_module}/*
lib/${_module}/tests/baseline_images/
- done
- # https://github.com/QuLogic/mpl-images/issues/1
- cp uint16.tif lib/matplotlib/tests/baseline_images/test_image/
-}
-
-build() {
- cd matplotlib
- python setup.py build
-}
-
-check() {
- cd matplotlib
- python -m venv --system-site-packages test-env
- test-env/bin/python setup.py install --skip-build
- # https://github.com/matplotlib/matplotlib/issues/21654
- xvfb-run -a -s "-screen 0 640x480x24" \
- test-env/bin/python -m pytest -ra -n auto -v --color=yes --pyargs
matplotlib mpl_toolkits.tests -k 'not test_ipynb'
-}
-
-package() {
- cd matplotlib
- python setup.py install --root "${pkgdir}" --prefix=/usr --optimize=1
--skip-build
- install -Dm644 doc/users/project/license.rst -t
"${pkgdir}"/usr/share/licenses/${pkgname}/
- # Remove tests
- rm -r "${pkgdir}"$(python -c "import site;
print(site.getsitepackages()[0])")/{matplotlib,mpl_toolkits}/tests/
-}
Copied: python-matplotlib/repos/community-staging-x86_64/PKGBUILD (from rev
1065604, python-matplotlib/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-08 04:20:22 UTC (rev 1065605)
@@ -0,0 +1,90 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Maintainer: Bruno Pagani <archa...@archlinux.org>
+# Contributor: Stéphane Gaudreault <steph...@archlinux.org>
+# Contributor: Stefan Husmann <stefan-husm...@t-online.de>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org>
+
+pkgname=python-matplotlib
+pkgver=3.5.0
+pkgrel=3
+pkgdesc="A python plotting library, making publication quality plots"
+arch=(x86_64)
+url="https://matplotlib.org";
+license=(custom)
+depends=(freetype2 python-cycler python-dateutil python-fonttools
python-kiwisolver python-numpy
+ python-packaging python-pillow python-pyparsing qhull)
+optdepends=('tk: Tk{Agg,Cairo} backends'
+ 'pyside2: alternative for Qt5{Agg,Cairo} backends'
+ 'pyside6: alternative for Qt6{Agg,Cairo} backends'
+ 'python-pyqt5: Qt5{Agg,Cairo} backends'
+ 'python-pyqt6: Qt6{Agg,Cairo} backends'
+ 'python-gobject: for GTK{3,4}{Agg,Cairo} backend'
+ 'python-wxpython: WX{Agg,Cairo} backend'
+ 'python-cairo: {GTK{3,4},Qt{5,6},Tk,WX}Cairo backends'
+ 'python-cairocffi: alternative for Cairo backends'
+ 'python-tornado: WebAgg backend'
+ 'ffmpeg: for saving movies'
+ 'imagemagick: for saving animated gifs'
+ 'ghostscript: usetex dependencies'
+ 'texlive-bin: usetex dependencies'
+ 'texlive-latexextra: usetex usage with pdflatex'
+ 'python-certifi: https support')
+makedepends=(git python-setuptools-scm-git-archive python-certifi)
+checkdepends=(python-pytest python-pytest-xdist python-pytest-runner
python-pytest-rerunfailures xorg-server-xvfb
+ 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=7a9ee717ecfa24ae4029abac0c7939076c2b0eb7 # git rev-parse v${pkgver}
+_ftver=2.11.0
+source=(git+https://github.com/matplotlib/matplotlib.git#tag=${_tag}?signed
+
https://github.com/QuLogic/mpl-images/archive/v${pkgver}rc1-with-freetype-${_ftver}/mpl-images-${pkgver}rc1-ft${_ftver}.tar.gz
+ freetype.patch)
+b2sums=(SKIP
+
29e87a2dd2fc37c3d33e7e0463ca02b468953abe896ac658a6764e78f61a56bb486f5fec51403b2bda726031c5352b4270049256ac8f630eef56ffb3071b870a
+
514324b3e17e832d5199eaa6592c05ca662b1164ddc95f16ea076d6a1063b06e6a8fa4eac7740e5f73afbcc9d17244c5cc41373d5787f62cd58eab10249302c9)
+validpgpkeys=(23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10) # Elliott Sales de
Andrade <quantum.anal...@gmail.com>
+
+prepare() {
+ cd matplotlib
+ # Fix SCM detected version
+ rm -r .git
+ echo "Version: ${pkgver}" > PKG-INFO
+ # 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
+ # Install tests for check()
+ sed -i 's|#tests = False|tests = True|' mplsetup.cfg
+ # Use appropriate baseline images for tests
+ cp lib/matplotlib/tests/baseline_images/test_image/uint16.tif .
+ for _module in matplotlib mpl_toolkits
+ do
+ rm -r lib/${_module}/tests/baseline_images/test*
+ mv ../mpl-images-${pkgver}rc1-with-freetype-${_ftver}/${_module}/*
lib/${_module}/tests/baseline_images/
+ done
+ # https://github.com/QuLogic/mpl-images/issues/1
+ cp uint16.tif lib/matplotlib/tests/baseline_images/test_image/
+}
+
+build() {
+ cd matplotlib
+ python setup.py build
+}
+
+check() {
+ cd matplotlib
+ python -m venv --system-site-packages test-env
+ test-env/bin/python setup.py install --skip-build
+ # test_ipynb: https://github.com/matplotlib/matplotlib/issues/21654
+ # test_pcolornearestunits:
https://github.com/matplotlib/matplotlib/issues/21271
+ xvfb-run -a -s "-screen 0 640x480x24" \
+ test-env/bin/python -m pytest -ra -n auto -v --color=yes --pyargs
matplotlib mpl_toolkits.tests -k 'not test_ipynb and not
test_pcolornearestunits'
+}
+
+package() {
+ cd matplotlib
+ python setup.py install --root "${pkgdir}" --prefix=/usr --optimize=1
--skip-build
+ install -Dm644 doc/users/project/license.rst -t
"${pkgdir}"/usr/share/licenses/${pkgname}/
+ # Remove tests
+ rm -r "${pkgdir}"$(python -c "import site;
print(site.getsitepackages()[0])")/{matplotlib,mpl_toolkits}/tests/
+}
Deleted: freetype.patch
===================================================================
--- freetype.patch 2021-12-08 04:20:12 UTC (rev 1065604)
+++ freetype.patch 2021-12-08 04:20:22 UTC (rev 1065605)
@@ -1,129 +0,0 @@
-From 0779db3fa70c58e88e048bec9b738ae02fccaead Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.anal...@gmail.com>
-Date: Fri, 14 Feb 2020 06:05:42 -0500
-
-Signed-off-by: Elliott Sales de Andrade <quantum.anal...@gmail.com>
----
- lib/matplotlib/__init__.py | 2 +-
- lib/matplotlib/tests/test_axes.py | 4 ++--
- lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
- lib/matplotlib/tests/test_polar.py | 2 +-
- lib/matplotlib/tests/test_tightlayout.py | 10 +++++-----
- setupext.py | 9 ++++++++-
- 7 files changed, 23 insertions(+), 13 deletions(-)
-
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index bc800e1322..10ff904c8e 100644
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -1198,7 +1198,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`
-- LOCAL_FREETYPE_VERSION = '2.6.1'
-+ LOCAL_FREETYPE_VERSION = '2.11.0'
-
- 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 2d6c1deed4..472e0e6902 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -6572,7 +6572,7 @@ def test_normal_axes():
- ]
- for nn, b in enumerate(bbaxis):
- targetbb = mtransforms.Bbox.from_bounds(*target[nn])
-- assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
-+ assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
-
- target = [
- [150.0, 119.999, 930.0, 11.111],
-@@ -6590,7 +6590,7 @@ def test_normal_axes():
-
- target = [85.5138, 75.88888, 1021.11, 1017.11]
- targetbb = mtransforms.Bbox.from_bounds(*target)
-- assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
-+ assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
-
- # 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 a8222a73d5..ea007a233f 100644
---- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -411,7 +411,7 @@ def test_hidden_axes():
- extents1 = np.copy(axs[0, 0].get_position().extents)
-
- np.testing.assert_allclose(
-- extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5)
-+ extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2)
-
-
- def test_colorbar_align():
-diff --git a/lib/matplotlib/tests/test_polar.py
b/lib/matplotlib/tests/test_polar.py
-index ea3cdfa129..d6cc018d5d 100644
---- a/lib/matplotlib/tests/test_polar.py
-+++ b/lib/matplotlib/tests/test_polar.py
-@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
- fig.canvas.draw()
- bb = ax.get_tightbbox(fig.canvas.get_renderer())
- assert_allclose(
-- bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1e-03)
-+ bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1)
-
-
- @check_figures_equal(extensions=["png"])
-diff --git a/lib/matplotlib/tests/test_tightlayout.py
b/lib/matplotlib/tests/test_tightlayout.py
-index 23d363b508..e94c863477 100644
---- a/lib/matplotlib/tests/test_tightlayout.py
-+++ b/lib/matplotlib/tests/test_tightlayout.py
-@@ -172,12 +172,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.
-- ans = [[[0.091, 0.607], [0.433, 0.933]],
-- [[0.579, 0.607], [0.922, 0.933]],
-- [[0.091, 0.140], [0.433, 0.466]],
-- [[0.579, 0.140], [0.922, 0.466]]]
-+ ans = [[[0.09, 0.61], [0.43, 0.93]],
-+ [[0.58, 0.61], [0.92, 0.93]],
-+ [[0.09, 0.14], [0.43, 0.47]],
-+ [[0.58, 0.14], [0.92, 0.47]]]
- for nn, ax in enumerate(fig.axes):
-- assert_array_equal(np.round(ax.get_position().get_points(), 3),
-+ assert_array_equal(np.round(ax.get_position().get_points(), 2),
- ans[nn])
-
-
-diff --git a/setupext.py b/setupext.py
-index 0d85f479d1..42d6fbe2ca 100644
---- a/setupext.py
-+++ b/setupext.py
-@@ -167,12 +167,18 @@ _freetype_hashes = {
- '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
- '2.10.1':
- '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
-+ '2.10.2':
-+ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
-+ '2.10.4':
-+ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
-+ '2.11.0':
-+ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
- }
- # This is the version of FreeType to use when building a local version. It
- # 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`.
--LOCAL_FREETYPE_VERSION = '2.6.1'
-+LOCAL_FREETYPE_VERSION = '2.11.0'
- LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
-
- # Also update the cache path in `.circleci/config.yml`.
-@@ -580,6 +586,7 @@ class FreeType(SetupPackage):
- ext.extra_objects.insert(
- 0, str(src_path / 'objs' / '.libs' / libfreetype))
- ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
-+ ext.libraries.append('brotlidec')
-
- def do_custom_build(self, env):
- # We're using a system freetype
Copied: python-matplotlib/repos/community-staging-x86_64/freetype.patch (from
rev 1065604, python-matplotlib/trunk/freetype.patch)
===================================================================
--- freetype.patch (rev 0)
+++ freetype.patch 2021-12-08 04:20:22 UTC (rev 1065605)
@@ -0,0 +1,129 @@
+From 0779db3fa70c58e88e048bec9b738ae02fccaead Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.anal...@gmail.com>
+Date: Fri, 14 Feb 2020 06:05:42 -0500
+
+Signed-off-by: Elliott Sales de Andrade <quantum.anal...@gmail.com>
+---
+ lib/matplotlib/__init__.py | 2 +-
+ lib/matplotlib/tests/test_axes.py | 4 ++--
+ lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
+ lib/matplotlib/tests/test_polar.py | 2 +-
+ lib/matplotlib/tests/test_tightlayout.py | 10 +++++-----
+ setupext.py | 9 ++++++++-
+ 7 files changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index bc800e1322..10ff904c8e 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -1198,7 +1198,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`
+- LOCAL_FREETYPE_VERSION = '2.6.1'
++ LOCAL_FREETYPE_VERSION = '2.11.0'
+
+ 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 2d6c1deed4..472e0e6902 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -6572,7 +6572,7 @@ def test_normal_axes():
+ ]
+ for nn, b in enumerate(bbaxis):
+ targetbb = mtransforms.Bbox.from_bounds(*target[nn])
+- assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
++ assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
+
+ target = [
+ [150.0, 119.999, 930.0, 11.111],
+@@ -6590,7 +6590,7 @@ def test_normal_axes():
+
+ target = [85.5138, 75.88888, 1021.11, 1017.11]
+ targetbb = mtransforms.Bbox.from_bounds(*target)
+- assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
++ assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
+
+ # 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 a8222a73d5..ea007a233f 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -411,7 +411,7 @@ def test_hidden_axes():
+ extents1 = np.copy(axs[0, 0].get_position().extents)
+
+ np.testing.assert_allclose(
+- extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5)
++ extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2)
+
+
+ def test_colorbar_align():
+diff --git a/lib/matplotlib/tests/test_polar.py
b/lib/matplotlib/tests/test_polar.py
+index ea3cdfa129..d6cc018d5d 100644
+--- a/lib/matplotlib/tests/test_polar.py
++++ b/lib/matplotlib/tests/test_polar.py
+@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
+ fig.canvas.draw()
+ bb = ax.get_tightbbox(fig.canvas.get_renderer())
+ assert_allclose(
+- bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1e-03)
++ bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1)
+
+
+ @check_figures_equal(extensions=["png"])
+diff --git a/lib/matplotlib/tests/test_tightlayout.py
b/lib/matplotlib/tests/test_tightlayout.py
+index 23d363b508..e94c863477 100644
+--- a/lib/matplotlib/tests/test_tightlayout.py
++++ b/lib/matplotlib/tests/test_tightlayout.py
+@@ -172,12 +172,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.
+- ans = [[[0.091, 0.607], [0.433, 0.933]],
+- [[0.579, 0.607], [0.922, 0.933]],
+- [[0.091, 0.140], [0.433, 0.466]],
+- [[0.579, 0.140], [0.922, 0.466]]]
++ ans = [[[0.09, 0.61], [0.43, 0.93]],
++ [[0.58, 0.61], [0.92, 0.93]],
++ [[0.09, 0.14], [0.43, 0.47]],
++ [[0.58, 0.14], [0.92, 0.47]]]
+ for nn, ax in enumerate(fig.axes):
+- assert_array_equal(np.round(ax.get_position().get_points(), 3),
++ assert_array_equal(np.round(ax.get_position().get_points(), 2),
+ ans[nn])
+
+
+diff --git a/setupext.py b/setupext.py
+index 0d85f479d1..42d6fbe2ca 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -167,12 +167,18 @@ _freetype_hashes = {
+ '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
+ '2.10.1':
+ '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
++ '2.10.2':
++ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
++ '2.10.4':
++ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
++ '2.11.0':
++ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
+ }
+ # This is the version of FreeType to use when building a local version. It
+ # 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`.
+-LOCAL_FREETYPE_VERSION = '2.6.1'
++LOCAL_FREETYPE_VERSION = '2.11.0'
+ LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
+
+ # Also update the cache path in `.circleci/config.yml`.
+@@ -580,6 +586,7 @@ class FreeType(SetupPackage):
+ ext.extra_objects.insert(
+ 0, str(src_path / 'objs' / '.libs' / libfreetype))
+ ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
++ ext.libraries.append('brotlidec')
+
+ def do_custom_build(self, env):
+ # We're using a system freetype
