[arch-commits] Commit in python-matplotlib/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Wednesday, October 24, 2018 @ 13:15:20
  Author: archange
Revision: 398821

Split out python2-matplotlib (3.0+ is py3 only)

Modified:
  python-matplotlib/trunk/PKGBUILD

----------+
 PKGBUILD |   91 ++++++++++++++-----------------------------------------------
 1 file changed, 22 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-24 13:14:09 UTC (rev 398820)
+++ PKGBUILD	2018-10-24 13:15:20 UTC (rev 398821)
@@ -4,8 +4,7 @@
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
 
-pkgbase=python-matplotlib
-pkgname=('python-matplotlib' 'python2-matplotlib')
+pkgname=python-matplotlib
 pkgver=2.2.3
 pkgrel=2
 pkgdesc="A python plotting library, making publication quality plots"
@@ -12,18 +11,26 @@
 arch=('x86_64')
 url='http://matplotlib.org'
 license=('custom')
-checkdepends=('python-pytest-xdist' 'python2-pytest-xdist' 'python-pytest-runner'
-              'python2-pytest-runner' 'python2-mock' 'xorg-server-xvfb' 'texlive-core'
+depends=('python-pytz' 'python-numpy' 'python-pyqt5' 'python-dateutil' 'python-pyparsing'
+         'python-cycler' 'python-kiwisolver' 'libxkbcommon-x11')
+optdepends=('python-gobject: for GTK3Agg/GTK3Cairo backend'
+            'python-cairocffi: for GTK3Agg/GTK3Cairo backend'
+            'tk: used by the TkAgg backend'
+            'ghostscript: usetex dependencies'
+            'texlive-bin: usetex dependencies'
+            'python-tornado: for webagg backend'
+            'python-pillow: for reading/saving .jpg/bmp/tiff files')
+checkdepends=('python-pytest-xdist' 'python-pytest-runner'
+              'xorg-server-xvfb' 'texlive-core'
               'texlive-latexextra' 'imagemagick' 'ffmpeg' 'mencoder' 'inkscape' 'python-pandas'
-              'python2-pandas' 'ttf-freefont')
-makedepends=('python2-pytz' 'python2-numpy' 'python-pytz' 'python-numpy'
-             'tk' 'python-cairocffi' 'python2-cairocffi' 'python-dateutil'
-             'python2-dateutil' 'python-gobject' 'python2-gobject' 'python-pyparsing'
-             'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin'
-             'python-tornado' 'python2-tornado' 'gtk3' 'wxpython' 'python-pyqt5' 'python2-pyqt5'
-             'libxkbcommon-x11' 'python-pillow' 'python2-pillow' 'python-setuptools'
-             'python2-setuptools' 'python-cycler' 'python2-cycler' 'python-kiwisolver'
-             'python2-kiwisolver')
+              'ttf-freefont')
+makedepends=('python-pytz' 'python-numpy'
+             'tk' 'python-cairocffi' 'python-dateutil'
+             'python-gobject' 'python-pyparsing'
+             'pygtk' 'python-six' 'ghostscript' 'texlive-bin'
+             'python-tornado' 'gtk3' 'wxpython' 'python-pyqt5'
+             'libxkbcommon-x11' 'python-pillow' 'python-setuptools'
+             'python-cycler' 'python-kiwisolver')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz"
         setup.cfg)
 sha512sums=('d118f5d56e2f578031aba22933c0b3a4423a31a04f50f08cc1aa660186546d09692a9cf401bb5f24cb296f94fbfd8707460728d501ac2bd4a624dfa89e92949b'
@@ -30,26 +37,10 @@
             'f08c0b2e94599fdf2b736b8a655d862209934441d90f20ed872cfc128b8d2a6525763ab7cf64f2b3630e22a90798f4c52aa93b18087e9b48708d9bae34aada0b')
 
 prepare() {
-  cp -a "$srcdir"/matplotlib-$pkgver{,-py2}
-
-  cd "$srcdir"/matplotlib-$pkgver
-  for file in $(find . -name '*.py' -print); do
-    sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \
-           -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" $file
-  done
-
-  cd "$srcdir"/matplotlib-$pkgver-py2
-  for file in $(find . -name '*.py' -print); do
-    sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
-           -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" $file
-  done
-
   cp -a "$srcdir"/matplotlib-$pkgver{,-test}
-  cp -a "$srcdir"/matplotlib-$pkgver-py2{,-test}
 
   # Configure tests (FS#48175)
   cp "$srcdir/setup.cfg" "$srcdir"/matplotlib-$pkgver-test/
-  cp "$srcdir/setup.cfg" "$srcdir"/matplotlib-$pkgver-py2-test/
 }
 
 build() {
@@ -58,10 +49,7 @@
   export XDG_RUNTIME_DIR=/tmp
 
   cd "$srcdir"/matplotlib-$pkgver
-  python3 setup.py build
-
-  cd "$srcdir"/matplotlib-$pkgver-py2
-  python2 setup.py build
+  python setup.py build
 }
 
 check() {
@@ -70,47 +58,12 @@
   cd "$srcdir"/matplotlib-$pkgver-test
   xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
     python setup.py pytest --addopts="-n auto" || warning "Tests failed"
-
-  cd "$srcdir"/matplotlib-$pkgver-py2-test
-  xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
-    python2 setup.py pytest --addopts="-n auto" || warning "Tests failed"
 }
 
 package_python-matplotlib() {
-  depends=('python-pytz' 'python-numpy' 'python-pyqt5' 'python-dateutil' 'python-pyparsing'
-           'python-cycler' 'python-kiwisolver' 'libxkbcommon-x11')
-  optdepends=('python-gobject: for GTK3Agg/GTK3Cairo backend'
-              'python-cairocffi: for GTK3Agg/GTK3Cairo backend'
-              'tk: used by the TkAgg backend'
-              'ghostscript: usetex dependencies'
-              'texlive-bin: usetex dependencies'
-              'python-tornado: for webagg backend'
-              'python-pillow: for reading/saving .jpg/bmp/tiff files')
-
   cd matplotlib-$pkgver
-  python3 setup.py install -O1 --skip-build --root "$pkgdir" --prefix=/usr
+  python setup.py install -O1 --skip-build --root "$pkgdir" --prefix=/usr
 
   install -dm755 "$pkgdir"/usr/share/licenses/python-matplotlib
   install -m 644 doc/users/license.rst "$pkgdir"/usr/share/licenses/python-matplotlib
 }
-
-package_python2-matplotlib() {
-  depends=('python2-pytz' 'python2-numpy' 'python2-pyqt5' 'python2-dateutil' 'python2-pyparsing'
-           'python2-cycler' 'python2-kiwisolver' 'libxkbcommon-x11' 'python2-backports.functools_lru_cache')
-  optdepends=('pygtk: for GTK/GTKAgg/GTKCairo backend'
-              'python2-cairo: for GTKCairo/GTK3Cairo backend'
-              'python2-cairocffi: for GTKCairo/GTK3Cairo backend (alternative to python2-cairo)'
-              'tk: used by the TkAgg backend'
-              'ghostscript: usetex dependencies'
-              'texlive-bin: usetex dependencies'
-              'python2-tornado: for webagg backend'
-              'python2-gobject: for GTK3Agg/GTK3Cairo backend'
-              'wxpython: for WX/WXAgg backend'
-              'python2-pillow: for reading/saving .jpg/bmp/tiff files')
-
-  cd matplotlib-$pkgver-py2
-  python2 setup.py install -O1 --skip-build --root "$pkgdir" --prefix=/usr
-
-  install -dm755 "$pkgdir"/usr/share/licenses/python2-matplotlib
-  install -m 644 doc/users/license.rst "$pkgdir"/usr/share/licenses/python2-matplotlib
-}