From 7422a6cfc9fdb67377348365a217e9b6060c390d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 13 Dec 2021 00:25:26 +0000
Subject: [PATCH] community/python-matplotlib to 3.5.1-1

---
 community/python-matplotlib/PKGBUILD | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
index 37dad0a53..7ad9475c4 100644
--- a/community/python-matplotlib/PKGBUILD
+++ b/community/python-matplotlib/PKGBUILD
@@ -10,7 +10,7 @@
 #  - disable lto via setup.cfg
 
 pkgname=python-matplotlib
-pkgver=3.5.0
+pkgver=3.5.1
 pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
 arch=(x86_64)
@@ -38,14 +38,14 @@ checkdepends=(python-pytest python-pytest-xdist python-pytest-runner python-pyte
               texlive-bin texlive-core texlive-latexextra texlive-pictures ghostscript inkscape ffmpeg imagemagick
               gtk4 python-cairo 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}
+_tag=312c1fb08c5d46aaccaf8b62c8673e4202523e8a # 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
+        https://github.com/QuLogic/mpl-images/archive/v3.5.0-with-freetype-${_ftver}/mpl-images-3.5.0-ft${_ftver}.tar.gz
         freetype.patch)
-b2sums=(SKIP
-        29e87a2dd2fc37c3d33e7e0463ca02b468953abe896ac658a6764e78f61a56bb486f5fec51403b2bda726031c5352b4270049256ac8f630eef56ffb3071b870a
-        514324b3e17e832d5199eaa6592c05ca662b1164ddc95f16ea076d6a1063b06e6a8fa4eac7740e5f73afbcc9d17244c5cc41373d5787f62cd58eab10249302c9)
+b2sums=('SKIP'
+        'fed606dcd4d338c6b1c7dd2add58b42b0e819598129618289036dda0499584287315819cce647c35999eb8375875e0488ca20311b03c79cf76dddb2bbdf366ba'
+        '514324b3e17e832d5199eaa6592c05ca662b1164ddc95f16ea076d6a1063b06e6a8fa4eac7740e5f73afbcc9d17244c5cc41373d5787f62cd58eab10249302c9')
 validpgpkeys=(23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10) # Elliott Sales de Andrade <quantum.analyst@gmail.com>
 
 prepare() {
@@ -59,14 +59,11 @@ prepare() {
   # 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 .
+  rm ../mpl-images-3.5.0-with-freetype-${_ftver}/matplotlib/test_streamplot/streamplot_startpoints.*
   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/
+    cp -r ../mpl-images-3.5.0-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() {
@@ -78,9 +75,10 @@ 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
+  # 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'
+    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() {