[arch-commits] Commit in python-netcdf4-openmpi/trunk (802.patch PKGBUILD)

[Bruno Pagani]

    Date: Saturday, June 2, 2018 @ 12:58:16
  Author: archange
Revision: 337460

Rebuild with tests fixed + just in case for the mess with non MPI version

Added:
  python-netcdf4-openmpi/trunk/802.patch
Modified:
  python-netcdf4-openmpi/trunk/PKGBUILD

-----------+
 802.patch |   22 ++++++++++++++++++++++
 PKGBUILD  |   15 ++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

Added: 802.patch
===================================================================
--- 802.patch	                        (rev 0)
+++ 802.patch	2018-06-02 12:58:16 UTC (rev 337460)
@@ -0,0 +1,22 @@
+From 138600a5a7df32772db1a81fd2882886818c8076 Mon Sep 17 00:00:00 2001
+From: Jeff Whitaker <jswhit at fastmail.fm>
+Date: Thu, 24 May 2018 16:45:17 -0600
+Subject: [PATCH] fix for failing test
+
+---
+ test/tst_cdf5.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/tst_cdf5.py b/test/tst_cdf5.py
+index 1b46c91a..175f9b53 100644
+--- a/test/tst_cdf5.py
++++ b/test/tst_cdf5.py
+@@ -4,7 +4,7 @@
+ from numpy.testing import assert_array_equal
+ 
+ FILE_NAME = tempfile.NamedTemporaryFile(suffix='.nc', delete=False).name
+-dimsize = np.iinfo(np.int64).max # max unsigned 64 bit integer
++dimsize = np.iinfo(np.int32).max*2 # only allowed in CDF5
+ ndim = 100
+ arrdata = np.random.randint(np.iinfo(np.uint8).min,np.iinfo(np.uint8).max,size=ndim)
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-02 12:57:56 UTC (rev 337459)
+++ PKGBUILD	2018-06-02 12:58:16 UTC (rev 337460)
@@ -5,16 +5,21 @@
 pkgbase=python-${_pkg,,}-${_mpi}
 pkgname=("python-${_pkg,,}-${_mpi}" "python2-${_pkg,,}-${_mpi}")
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python/NumPy interface to the netCDF C library (${_mpi} version)"
 arch=('x86_64')
 url="https://unidata.github.io/${_pkg,,}-python"
 license=('MIT')
 makedepends=('cython' 'python-setuptools' 'cython2' 'python2-setuptools' 'python-numpy' 'python-cftime' 'python-mpi4py' 'python2-numpy' 'python2-cftime' 'python2-mpi4py' "netcdf-${_mpi}")
-source=("https://pypi.io/packages/source/n/${_pkg}/${_pkg}-${pkgver}.tar.gz")
-sha256sums=('a6c0b46f410f101c09d60b8cc460aafec06732f0130c6cb2730717bcc605b388')
+source=("https://pypi.io/packages/source/n/${_pkg}/${_pkg}-${pkgver}.tar.gz"
+        '802.patch')
+sha256sums=('a6c0b46f410f101c09d60b8cc460aafec06732f0130c6cb2730717bcc605b388'
+            '17e3442e75d75fcba5fabe387f5dc5ef1cc2e7a4de25d96a2fcec699ce628289')
 
 prepare() {
+    cd ${_pkg}-${pkgver}
+    patch -p1 -i ../802.patch
+    cd ..
     cp -a ${_pkg}-${pkgver}{,-py2}
 }
 
@@ -28,10 +33,10 @@
 
 check() {
     cd ${_pkg}-${pkgver}/test
-    PYTHONPATH="../build/lib.linux-${CARCH}-3.6" python -B ./run_all.py || warning "Tests failed"
+    PYTHONPATH="../build/lib.linux-${CARCH}-3.6" python -B ./run_all.py
 
     cd ../../${_pkg}-${pkgver}-py2/test
-    PYTHONPATH="../build/lib.linux-${CARCH}-2.7" python2 -B ./run_all.py || warning "Tests failed"
+    PYTHONPATH="../build/lib.linux-${CARCH}-2.7" python2 -B ./run_all.py
 }
 
 package_python-netcdf4-openmpi() {