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

[Bruno Pagani]

    Date: Sunday, December 15, 2019 @ 16:29:41
  Author: archange
Revision: 537749

upgpkg: python-h5py-openmpi 2.10.0-1

Also a bit of PKGBUILD cleaning

Modified:
  python-h5py-openmpi/trunk/PKGBUILD

----------+
 PKGBUILD |   83 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 41 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-15 16:00:09 UTC (rev 537748)
+++ PKGBUILD	2019-12-15 16:29:41 UTC (rev 537749)
@@ -1,4 +1,4 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
 # Contributor: Joey Dumont <joey.dumont at gmail.com>
 
 _pkg=h5py
@@ -5,67 +5,66 @@
 _mpi=openmpi
 pkgbase=python-${_pkg}-${_mpi}
 pkgname=("python-${_pkg}-${_mpi}" "python2-${_pkg}-${_mpi}")
-pkgver=2.9.0
-pkgrel=4
+pkgver=2.10.0
+pkgrel=1
 pkgdesc="General-purpose Python bindings for the HDF5 library (${_mpi} version)"
+arch=(x86_64)
 url="https://www.h5py.org/"
-arch=('x86_64')
-license=('BSD')
-makedepends=("hdf5-${_mpi}" 'cython' 'cython2' 'python-numpy' 'python2-numpy' 'python-six' 'python2-six'
-             'python-pkgconfig' 'python2-pkgconfig' 'python-mpi4py' 'python2-mpi4py')
-checkdepends=('inetutils' 'python2-unittest2')
-source=("https://files.pythonhosted.org/packages/source/h/$_pkg/$_pkg-$pkgver.tar.gz"{,.asc}
-        h5py-hdf5-1.10.5.patch::"https://github.com/h5py/h5py/commit/141eafa531c6c09a06efe6a694251a1eea84908d.patch")
-sha256sums=('9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002' 'SKIP'
-            '01fff5338ea37458856660cc5cfee5263b7d20d32fadd31ae45bd1e10d085e11')
-validpgpkeys=('AC47F71DB275ECD0B3DA46E857FA4540DD4EFCF7' # Thomas A Caswell (Brookhaven National Lab) <tcaswell at bnl.gov>
-              '96B7334D7610EE3E68AFFE589E027116943D6A8B') # Thomas A Caswell <tcaswell at bnl.gov> (new key)
+license=(BSD)
+depends=(hdf5-${_mpi})
+makedepends=(cython cython2 python-numpy python2-numpy python-six python2-six
+             python-pkgconfig python2-pkgconfig python-mpi4py python2-mpi4py)
+checkdepends=(inetutils python-pytest python2-pytest python2-unittest2)
+source=(https://files.pythonhosted.org/packages/source/h/${_pkg}/${_pkg}-${pkgver}.tar.gz)
+sha256sums=('84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d')
+validpgpkeys=(AC47F71DB275ECD0B3DA46E857FA4540DD4EFCF7 # Thomas A Caswell (Brookhaven National Lab) <tcaswell at bnl.gov>
+              96B7334D7610EE3E68AFFE589E027116943D6A8B) # Thomas A Caswell <tcaswell at bnl.gov> (new key)
+# See https://github.com/h5py/h5py/issues/1299 about lack of GPG sigs for recent releases
 
-
 prepare() {
-    # Remove RPATH
-    sed -i "s/settings\\['runtime_library_dirs'\\] = settings\\['library_dirs'\\]/pass/" ${_pkg}-${pkgver}/setup_build.py
-    (cd $_pkg-$pkgver && patch -p1 -i ../h5py-hdf5-1.10.5.patch)
-    cp -a ${_pkg}-${pkgver}{,-py2}
+  # Remove RPATH
+  sed -i "s/settings\\['runtime_library_dirs'\\] = settings\\['library_dirs'\\]/pass/" ${_pkg}-${pkgver}/setup_build.py
+  cp -a ${_pkg}-${pkgver}{,-py2}
 }
 
 build() {
-    export CC=mpicc
-    cd ${_pkg}-${pkgver}
-    python setup.py configure --mpi 
-    python setup.py build
+  export CC=mpicc
+  cd ${_pkg}-${pkgver}
+  python setup.py configure --mpi 
+  python setup.py build
 
-    cd ../${_pkg}-${pkgver}-py2
-    python2 setup.py configure --mpi
-    python2 setup.py build
+  cd ../${_pkg}-${pkgver}-py2
+  python2 setup.py configure --mpi
+  python2 setup.py build
 }
 
 check() {
-    cd ${_pkg}-${pkgver}
-    python setup.py test
+  cd ${_pkg}-${pkgver}
+  python setup.py test
 
-    cd ../${_pkg}-${pkgver}-py2
-    python2 setup.py test
+  cd ../${_pkg}-${pkgver}-py2
+  # https://github.com/h5py/h5py/issues/1435
+  python2 setup.py test || warning "Tests failed"
 }
 
 package_python-h5py-openmpi() {
-    depends=('hdf5-openmpi' 'python-numpy' 'python-six' 'python-mpi4py')
-    conflicts=('python-h5py')
-    provides=('python-h5py')
+  depends+=(python-numpy python-six python-mpi4py)
+  conflicts=(python-h5py)
+  provides=(python-h5py)
 
-    cd ${_pkg}-${pkgver}
-    python setup.py install --skip-build --root="${pkgdir}" --optimize=1
+  cd ${_pkg}-${pkgver}
+  python setup.py install --root="${pkgdir}" --skip-build --optimize=1
 
-    install -D licenses/license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 licenses/license.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
 
 package_python2-h5py-openmpi() {
-    depends=('hdf5-openmpi' 'python2-numpy' 'python2-six' 'python2-mpi4py')
-    conflicts=('python2-h5py')
-    provides=('python2-h5py')
+  depends+=(python2-numpy python2-six python2-mpi4py)
+  conflicts=(python2-h5py)
+  provides=(python2-h5py)
 
-    cd ${_pkg}-${pkgver}-py2
-    python2 setup.py install --skip-build --root="${pkgdir}" --optimize=1
+  cd ${_pkg}-${pkgver}-py2
+  python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1
 
-    install -D licenses/license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 licenses/license.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
 }