development/python3-matplotlib: Updated for version 2.2.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

development/python3-matplotlib/README

@@ -7,15 +7,15 @@ of ipython uses matplotlib to emulate matlab graphics.
 This is the Python 3 version of matplotlib and can coexist with
 SBo's matplotlib package.
 
-NOTES: 1 - If you want to enable the optional subpackages tests
-           and toolkits_tests you need to install Python 3
-           versions of nose and mock before matplotlib. THESE
-           AREN'T YET AVAILABLE AS SLACKBUILDS!
-           To enable the above mentioned subpackages you have to
-           set the variables DISABLE_TESTS and DISABLE_TK_TESTS
-           respectively to "no".
-           toolkits_tests doesn't get installed, if test and/or
-           toolkits are disabled. The installation of toolkits is
-           done automatically.
+OPTIONAL DEPENDENCIES: python3-PyQt5, wxPython4, python3-pytest, ffmpeg,
+                       avconv, Inkscape
 
-        2 - pytz dependency must be compiled with Python 3 support.
+
+NOTES: If you want to enable the optional subpackages tests and
+       toolkits_tests you need to set the variable ENABLE_TESTS
+       to "yes" when executing the SlackBuild and make sure that
+       python3-pytest, ffmpeg, avconv and Inkscape are already
+       installed. Besides ffmpeg/avconv are also needed if you
+       wish better support of animation output formats.
+
+       The pytz dependency must be compiled with Python 3 support.

development/python3-matplotlib/python3-matplotlib.SlackBuild

@@ -2,7 +2,7 @@
 
 # Slackware build script for the Python 3 version of matplotlib
 
-# Copyright 2011-2017 Serban Udrea <s.udrea@gsi.de>
+# Copyright 2011-2019 Serban Udrea <s.udrea@gsi.de>
 #                     Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
@@ -26,19 +26,19 @@
 
 # Written by Aleksandar Samardzic <asamardzic@gmail.com>
 # Updated to 0.99.1.2 by João Felipe Santos <joao.eel@gmail.com>
-# Patch for libpng borrowed from Arch Linux
-# Updated up to version 1.5.2 by Serban Udrea <S.Udrea@gsi.de>
+# Patch for libpng borrowed from Arch Linux (no longer needed, 2019.01.31, S.U.)
 # Adapted for Python 3 by Jeremy Hansen
+# Updated up to version 2.2.3 by Serban Udrea <S.Udrea@gsi.de>
+
 
 PRGNAM=python3-matplotlib
 SRCNAM=matplotlib
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-TARBALL_VERSION=${TARBALL_VERSION:-1.5.2} # Tarball sometimes has a wrong version number
-DISABLE_TESTS=${DISABLE_TESTS:-Y}
-DISABLE_TK_TESTS=${DISABLE_TK_TESTS:-Y}
+TARBALL_VERSION=${TARBALL_VERSION:-2.2.3} # Tarball may have wrong versioning
+ENABLE_TESTS=${ENABLE_TESTS:-N}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -68,28 +68,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Use setup.cfg to decide about the optional subpackages tests and
-# toolkits_tests
+ENABLE_TESTS=$(echo "$ENABLE_TESTS"|cut -b 1|tr a-z A-Z)
+# Use setup.cfg to decide about the optional tests
 #
 cat setup.cfg.template > setup.cfg
-
-DISABLE_TESTS=$(echo "$DISABLE_TESTS"|cut -b 1|tr a-z A-Z)
-DISABLE_TK_TESTS=$(echo "$DISABLE_TK_TESTS"|cut -b 1|tr a-z A-Z)
-
-if [ "$DISABLE_TESTS" = "Y" ]
+if [ "$ENABLE_TESTS" = "Y" ]
 then
- sed -i "s|#tests = True|tests = False|" setup.cfg
-else
- python3 -c "import nose, mock" > /dev/null 2>&1 || \
- { echo "ERROR: Missing requirements nose and/or mock!" && exit 1; }
-fi
-
-if [ "$DISABLE_TK_TESTS" = "Y" ]
-then
- sed -i "s|#toolkits_tests = auto|toolkits_tests = False|" setup.cfg
-elif [ "$DISABLE_TESTS" = "Y" ]
-then
- echo "ERROR: Cannot enable toolkits_tests if tests are disabled!" && exit 1
+ sed -i "s|#tests = False|tests = True|" setup.cfg
 fi
 
 # Use modified setupext.py to make sure that the build process gets
@@ -103,7 +88,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL.rst  MANIFEST.in  README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install

development/python3-matplotlib/python3-matplotlib.info

@@ -1,10 +1,10 @@
 PRGNAM="python3-matplotlib"
-VERSION="1.5.2"
+VERSION="2.2.3"
 HOMEPAGE="https://matplotlib.org/"
-DOWNLOAD="https://pypi.python.org/packages/15/89/240b4ebcd63bcdde9aa522fbd2e13f0af3347bea443cb8ad111e3b4c6f3a/matplotlib-1.5.2.tar.gz"
-MD5SUM="66f35e55cc15455eb37b415ae51f1e51"
+DOWNLOAD="https://files.pythonhosted.org/packages/eb/a0/31b6ba00bc4dcbc06f0b80d1ad6119a9cc3081ecb04a00117f6c1ca3a084/matplotlib-2.2.3.tar.gz"
+MD5SUM="403b0bddd751d71187416f20d4cff100"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="numpy3 python3-dateutil pytz python3-tornado python3-pyparsing python3-cycler"
+REQUIRES="numpy3 python3-dateutil python3-pyparsing pytz python3-cycler python3-six python3-kiwisolver python3-tornado"
 MAINTAINER="Serban Udrea"
 EMAIL="S.Udrea@gsi.de"