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

[Bruno Pagani via arch-commits]

Date: Tuesday, August 14, 2018 @ 17:05:35
  Author: archange
Revision: 371620

upgpkg: python-netcdf4 1.4.1-1

Modified:
  python-netcdf4/trunk/PKGBUILD
Deleted:
  python-netcdf4/trunk/802.patch

---+
 802.patch |   22 --
 PKGBUILD  |   13 -
 2 files changed, 4 insertions(+), 31 deletions(-)

Deleted: 802.patch
===
--- 802.patch   2018-08-14 17:03:16 UTC (rev 371619)
+++ 802.patch   2018-08-14 17:05:35 UTC (rev 371620)
@@ -1,22 +0,0 @@
-From 138600a5a7df32772db1a81fd2882886818c8076 Mon Sep 17 00:00:00 2001
-From: Jeff Whitaker 
-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
===
--- PKGBUILD2018-08-14 17:03:16 UTC (rev 371619)
+++ PKGBUILD2018-08-14 17:05:35 UTC (rev 371620)
@@ -6,22 +6,17 @@
 _pkg=netCDF4
 pkgbase=python-${_pkg,,}
 pkgname=("python-${_pkg,,}" "python2-${_pkg,,}")
-pkgver=1.4.0
-pkgrel=3
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Python/NumPy interface to the netCDF C library"
 arch=('x86_64')
 url="https://unidata.github.io/${_pkg,,}-python;
 license=('MIT')
 makedepends=('cython' 'python-setuptools' 'cython2' 'python2-setuptools' 
'python-numpy' 'python-cftime' 'python2-numpy' 'python2-cftime' 'netcdf')
-source=("https://pypi.io/packages/source/n/${_pkg}/${_pkg}-${pkgver}.tar.gz;
-'802.patch')
-sha256sums=('a6c0b46f410f101c09d60b8cc460aafec06732f0130c6cb2730717bcc605b388'
-'17e3442e75d75fcba5fabe387f5dc5ef1cc2e7a4de25d96a2fcec699ce628289')
+source=("https://pypi.io/packages/source/n/${_pkg}/${_pkg}-${pkgver}.tar.gz;)
+sha256sums=('d4fc65b98e348c39d082ab6b4b7f6d636b1b4e63bec016e5bca189fee5d46403')
 
 prepare() {
-cd ${_pkg}-${pkgver}
-patch -p1 -i ../802.patch
-cd ..
 cp -a ${_pkg}-${pkgver}{,-py2}
 }
 

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

[Bruno Pagani via arch-commits]

Date: Thursday, May 24, 2018 @ 23:24:55
  Author: archange
Revision: 329222

Fix failing test thanks to upstream patch

No new build because the code has not changed, only the test.

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

---+
 802.patch |   22 ++
 PKGBUILD  |   13 +
 2 files changed, 31 insertions(+), 4 deletions(-)

Added: 802.patch
===
--- 802.patch   (rev 0)
+++ 802.patch   2018-05-24 23:24:55 UTC (rev 329222)
@@ -0,0 +1,22 @@
+From 138600a5a7df32772db1a81fd2882886818c8076 Mon Sep 17 00:00:00 2001
+From: Jeff Whitaker 
+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
===
--- PKGBUILD2018-05-24 22:47:24 UTC (rev 329221)
+++ PKGBUILD2018-05-24 23:24:55 UTC (rev 329222)
@@ -13,10 +13,15 @@
 url="https://unidata.github.io/${_pkg,,}-python;
 license=('MIT')
 makedepends=('cython' 'python-setuptools' 'cython2' 'python2-setuptools' 
'python-numpy' 'python-cftime' 'python2-numpy' 'python2-cftime' 'netcdf')
-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}
 }
 
@@ -30,10 +35,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() {