[arch-commits] Commit in python-netcdf4-openmpi/repos/community-x86_64 (3 files)

Bruno Pagani archange at archlinux.org
Wed Aug 15 13:22:38 UTC 2018


    Date: Wednesday, August 15, 2018 @ 13:22:38
  Author: archange
Revision: 371800

archrelease: copy trunk to community-x86_64

Added:
  python-netcdf4-openmpi/repos/community-x86_64/PKGBUILD
    (from rev 371799, python-netcdf4-openmpi/trunk/PKGBUILD)
Deleted:
  python-netcdf4-openmpi/repos/community-x86_64/802.patch
  python-netcdf4-openmpi/repos/community-x86_64/PKGBUILD

-----------+
 802.patch |   22 ----------
 PKGBUILD  |  125 +++++++++++++++++++++++++++++-------------------------------
 2 files changed, 62 insertions(+), 85 deletions(-)

Deleted: 802.patch
===================================================================
--- 802.patch	2018-08-15 13:22:24 UTC (rev 371799)
+++ 802.patch	2018-08-15 13:22:38 UTC (rev 371800)
@@ -1,22 +0,0 @@
-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)
- 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-15 13:22:24 UTC (rev 371799)
+++ PKGBUILD	2018-08-15 13:22:38 UTC (rev 371800)
@@ -1,63 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-_pkg=netCDF4
-_mpi=openmpi
-pkgbase=python-${_pkg,,}-${_mpi}
-pkgname=("python-${_pkg,,}-${_mpi}" "python2-${_pkg,,}-${_mpi}")
-pkgver=1.4.0
-pkgrel=3
-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"
-        '802.patch')
-sha256sums=('a6c0b46f410f101c09d60b8cc460aafec06732f0130c6cb2730717bcc605b388'
-            '17e3442e75d75fcba5fabe387f5dc5ef1cc2e7a4de25d96a2fcec699ce628289')
-
-prepare() {
-    cd ${_pkg}-${pkgver}
-    patch -p1 -i ../802.patch
-    cd ..
-    cp -a ${_pkg}-${pkgver}{,-py2}
-}
-
-build() {
-    cd ${_pkg}-${pkgver}
-    USE_NCCONFIG=1 python setup.py build
-
-    cd ../${_pkg}-${pkgver}-py2
-    USE_NCCONFIG=1 python2 setup.py build
-}
-
-check() {
-    cd ${_pkg}-${pkgver}/test
-    PYTHONPATH="../build/lib.linux-${CARCH}-3.7" python -B ./run_all.py
-
-    cd ../../${_pkg}-${pkgver}-py2/test
-    PYTHONPATH="../build/lib.linux-${CARCH}-2.7" python2 -B ./run_all.py
-}
-
-package_python-netcdf4-openmpi() {
-    depends=('python-numpy' 'python-cftime' 'python-mpi4py' "netcdf-${_mpi}")
-
-    cd ${_pkg}-${pkgver}
-    USE_NCCONFIG=1 python setup.py install --root="${pkgdir}" --skip-build --optimize=2
-
-    install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
-    install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}
-
-package_python2-netcdf4-openmpi() {
-    depends=('python2-numpy' 'python2-cftime' 'python2-mpi4py' "netcdf-${_mpi}")
-
-    cd ${_pkg}-${pkgver}-py2
-    USE_NCCONFIG=1 python2 setup.py install --root="${pkgdir}" --skip-build --optimize=2
-
-    for binary in "${pkgdir}"/usr/bin/* ;
-        do mv ${binary}{,-py2} ;
-    done
-    install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
-    install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}

Copied: python-netcdf4-openmpi/repos/community-x86_64/PKGBUILD (from rev 371799, python-netcdf4-openmpi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-15 13:22:38 UTC (rev 371800)
@@ -0,0 +1,62 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+_pkg=netCDF4
+_mpi=openmpi
+pkgbase=python-${_pkg,,}-${_mpi}
+pkgname=("python-${_pkg,,}-${_mpi}" "python2-${_pkg,,}-${_mpi}")
+pkgver=1.4.1
+pkgrel=1
+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=('d4fc65b98e348c39d082ab6b4b7f6d636b1b4e63bec016e5bca189fee5d46403')
+
+prepare() {
+    cp -a ${_pkg}-${pkgver}{,-py2}
+}
+
+build() {
+    cd ${_pkg}-${pkgver}
+    USE_NCCONFIG=1 python setup.py build
+
+    cd ../${_pkg}-${pkgver}-py2
+    USE_NCCONFIG=1 python2 setup.py build
+}
+
+check() {
+    cd ${_pkg}-${pkgver}/test
+    PYTHONPATH="../build/lib.linux-${CARCH}-3.7" python -B ./run_all.py
+
+    cd ../../${_pkg}-${pkgver}-py2/test
+    PYTHONPATH="../build/lib.linux-${CARCH}-2.7" python2 -B ./run_all.py
+}
+
+package_python-netcdf4-openmpi() {
+    depends=('python-numpy' 'python-cftime' 'python-mpi4py' "netcdf-${_mpi}")
+    conflicts=('python-netcdf4')
+    provides=('python-netcdf4')
+
+    cd ${_pkg}-${pkgver}
+    USE_NCCONFIG=1 python setup.py install --root="${pkgdir}" --skip-build --optimize=2
+
+    install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
+    install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}
+
+package_python2-netcdf4-openmpi() {
+    depends=('python2-numpy' 'python2-cftime' 'python2-mpi4py' "netcdf-${_mpi}")
+    conflicts=('python2-netcdf4')
+    provides=('python2-netcdf4')
+
+    cd ${_pkg}-${pkgver}-py2
+    USE_NCCONFIG=1 python2 setup.py install --root="${pkgdir}" --skip-build --optimize=2
+
+    for binary in "${pkgdir}"/usr/bin/* ;
+        do mv ${binary}{,-py2} ;
+    done
+    install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
+    install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}



More information about the arch-commits mailing list