development/python3-matplotlib: Updated for version 2.2.3.

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

1 files changed, 12 insertions, 27 deletions

diff --git a/development/python3-matplotlib/python3-matplotlib.SlackBuild b/development/python3-matplotlib/python3-matplotlib.SlackBuild
index 39b5426fe4..5722f9f700 100644
--- a/development/python3-matplotlib/python3-matplotlib.SlackBuild
+++ b/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" ]
-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" ]
+if [ "$ENABLE_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