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

[Balló György]

    Date: Thursday, August 29, 2019 @ 10:54:26
  Author: bgyorgy
Revision: 504762

upgpkg: python-basemap 1.2.1-1

New upstream release, remove python2 support

Modified:
  python-basemap/trunk/PKGBUILD

----------+
 PKGBUILD |   46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-29 10:50:33 UTC (rev 504761)
+++ PKGBUILD	2019-08-29 10:54:26 UTC (rev 504762)
@@ -4,64 +4,39 @@
 # Contributor: Julien Morin <jmorin at cp.dias.ie>
 
 pkgbase=python-basemap
-pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
-pkgver=1.2.0
+pkgname=('python-basemap' 'python-basemap-common')
+pkgver=1.2.1
 pkgrel=1
 arch=('x86_64')
 url="https://matplotlib.org/basemap/"
 license=('MIT')
-makedepends=('cython' 'python2-numpy' 'python-numpy' 'geos' 'shapelib'
-             'python2-pyproj' 'python-pyproj' 'python2-setuptools' 'python-setuptools')
+makedepends=('cython' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-pyproj')
 source=($pkgname-$pkgver.tar.gz::https://github.com/matplotlib/basemap/archive/v${pkgver}rel.tar.gz
         LICENSE)
-sha256sums=('bd5bf305918a2eb675939873b735238f9e3dfe6b5c290e37c41e5b082ff3639a'
+sha256sums=('3fb30424f18cd4ffd505e30fd9c810ae81b999bb92f950c76553e1abc081faa7'
             '0deac85afb0740df7626b6d8d7aa4b8814bbe9a412fb1a0e5962895d17e63add')
 
-_py2basever=2.7
-_py3basever=3.7
-
 prepare() {
   pushd "${srcdir}"/basemap-${pkgver}rel
-# regenerate cythonized sources for python 3.7
+# regenerate cythonized sources
   cythonize --force src/_geoslib.pyx
 # Remove the bundled libraries and common data
   rm -r geos-*
   sed -i "s/lib64/lib/g" setup.py
   popd
-
-  cp -a "${srcdir}"/basemap-${pkgver}rel{,-python2}
 }
 
 build() {
-# Python2 Version
-  cd "${srcdir}"/basemap-${pkgver}rel-python2
-  python2 setup.py config
-  python2 setup.py build
-
-# Python3 Version
   cd "${srcdir}"/basemap-${pkgver}rel
   python setup.py config
   python setup.py build
 }
 
-package_python2-basemap() {
-  pkgdesc="Toolkit for plotting data on map projections"
-  depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2' 'python2-pyproj')
-  optdepends=('python2-pillow: Python Imaging Library is only needed for bluemarble and warpimage methods.')
-
-  cd "${srcdir}"/basemap-${pkgver}rel-python2
-
-  python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-  rm -fr "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
-  ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
-}
-
 package_python-basemap() {
   pkgdesc="Toolkit for plotting data on map projections"
-  depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-httplib2' 'python-pyproj')
-  optdepends=('python-pillow: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+  depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-pyproj')
+  optdepends=('python-owslib: needed for the BaseMap.wmsimage function'
+              'python-pillow: needed for Basemap warpimage, bluemarble, shadedrelief and etop methods')
 
   cd "${srcdir}"/basemap-${pkgver}rel
 
@@ -68,8 +43,9 @@
   python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
   install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 
-  rm -fr "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
-  ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
+  _sitepackages=`python -c "import site; print(site.getsitepackages()[0])"`
+  rm -fr "${pkgdir}${_sitepackages}"/mpl_toolkits/basemap/data
+  ln -sf /usr/share/basemap/data "${pkgdir}${_sitepackages}"/mpl_toolkits/basemap/data
 }
 
 package_python-basemap-common() {