[arch-commits] Commit in python-netcdf4/trunk (PKGBUILD fix-cdf5-test.patch)

[Bruno Pagani]

    Date: Wednesday, November 1, 2017 @ 18:50:14
  Author: archange
Revision: 265034

upgpkg: python-netcdf4 1.3.1-1

Added:
  python-netcdf4/trunk/fix-cdf5-test.patch
Modified:
  python-netcdf4/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   19 ++++++++++++-------
 fix-cdf5-test.patch |   13 +++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-01 17:54:13 UTC (rev 265033)
+++ PKGBUILD	2017-11-01 18:50:14 UTC (rev 265034)
@@ -1,4 +1,4 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
 # Contributor: Spyros Stathopoulos <foucault.online at gmail.com>
 # Contributor: richli <rich at dranek dot com>
 # Contributor: rememberthemer <rememberthemer at _GMAIL_DOT_COM_>
@@ -6,17 +6,22 @@
 _pkg=netCDF4
 pkgbase=python-${_pkg,,}
 pkgname=("python-${_pkg,,}" "python2-${_pkg,,}")
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="Python/NumPy interface to the netCDF C library"
 arch=('x86_64' 'i686')
 url="https://unidata.github.io/${_pkg,,}-python"
 license=('MIT')
 makedepends=('cython' 'python-setuptools' 'cython2' 'python2-setuptools' 'python-numpy' 'python2-numpy' 'netcdf')
-source=("https://pypi.io/packages/source/n/${_pkg}/${_pkg}-${pkgver}.tar.gz")
-sha256sums=('1982372aeacc6b36054d90d8cb54ee9506b66b6f44d5cff10e2ffb162aad5476')
+source=("https://pypi.io/packages/source/n/${_pkg}/${_pkg}-${pkgver}.tar.gz"
+        'fix-cdf5-test.patch')
+sha256sums=('570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957'
+            '5b300628ce1c22cdd58062196f3a410f673e568c04a35450baf3e75505734efc')
 
 prepare() {
+    cd ${_pkg}-${pkgver}
+    patch -p1 -i ../fix-cdf5-test.patch
+    cd ..
     cp -a ${_pkg}-${pkgver}{,-py2}
 }
 
@@ -30,10 +35,10 @@
 
 check() {
     cd ${_pkg}-${pkgver}/test
-    NO_NET=1 PYTHONPATH="../build/lib.linux-${CARCH}-3.6" python -B ./run_all.py || warning "Tests failed"
+    NO_NET=1 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() {

Added: fix-cdf5-test.patch
===================================================================
--- fix-cdf5-test.patch	                        (rev 0)
+++ fix-cdf5-test.patch	2017-11-01 18:50:14 UTC (rev 265034)
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -81,7 +81,7 @@ def check_api(inc_dirs):
+             has_cdf5 = False
+             for line in open(ncmetapath):
+                 if line.startswith('#define NC_HAS_CDF5'):
+-                    has_cdf5 = True
++                    has_cdf5_format = bool(int(line.split()[2]))
+         break
+ 
+     return has_rename_grp, has_nc_inq_path, has_nc_inq_format_extended, \
+