[arch-commits] Commit in python-netcdf4/repos (6 files)
Bruno Pagani
archange at archlinux.org
Wed Nov 1 18:50:55 UTC 2017
Date: Wednesday, November 1, 2017 @ 18:50:54
Author: archange
Revision: 265035
archrelease: copy trunk to community-staging-x86_64, community-staging-i686
Added:
python-netcdf4/repos/community-staging-i686/PKGBUILD
(from rev 265034, python-netcdf4/trunk/PKGBUILD)
python-netcdf4/repos/community-staging-i686/fix-cdf5-test.patch
(from rev 265034, python-netcdf4/trunk/fix-cdf5-test.patch)
python-netcdf4/repos/community-staging-x86_64/PKGBUILD
(from rev 265034, python-netcdf4/trunk/PKGBUILD)
python-netcdf4/repos/community-staging-x86_64/fix-cdf5-test.patch
(from rev 265034, python-netcdf4/trunk/fix-cdf5-test.patch)
Deleted:
python-netcdf4/repos/community-staging-i686/PKGBUILD
python-netcdf4/repos/community-staging-x86_64/PKGBUILD
----------------------------------------------+
/PKGBUILD | 126 +++++++++++++++++++++++++
community-staging-i686/PKGBUILD | 58 -----------
community-staging-i686/fix-cdf5-test.patch | 13 ++
community-staging-x86_64/PKGBUILD | 58 -----------
community-staging-x86_64/fix-cdf5-test.patch | 13 ++
5 files changed, 152 insertions(+), 116 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2017-11-01 18:50:14 UTC (rev 265034)
+++ community-staging-i686/PKGBUILD 2017-11-01 18:50:54 UTC (rev 265035)
@@ -1,58 +0,0 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <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_>
-
-_pkg=netCDF4
-pkgbase=python-${_pkg,,}
-pkgname=("python-${_pkg,,}" "python2-${_pkg,,}")
-pkgver=1.3.0
-pkgrel=2
-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')
-
-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
- NO_NET=1 PYTHONPATH="../build/lib.linux-${CARCH}-3.6" python -B ./run_all.py || warning "Tests failed"
-
- cd ../../${_pkg}-${pkgver}-py2/test
- PYTHONPATH="../build/lib.linux-${CARCH}-2.7" python2 -B ./run_all.py || warning "Tests failed"
-}
-
-package_python-netcdf4() {
- depends=('python-numpy' 'netcdf')
-
- cd ${_pkg}-${pkgver}
- USE_NCCONFIG=1 python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=2
-
- rm -r "${pkgdir}"/usr/bin
- install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
- install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}
-
-package_python2-netcdf4() {
- depends=('python2-numpy' 'netcdf')
-
- cd ${_pkg}-${pkgver}-py2
- USE_NCCONFIG=1 python2 setup.py install --prefix=/usr --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}
-}
Copied: python-netcdf4/repos/community-staging-i686/PKGBUILD (from rev 265034, python-netcdf4/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-11-01 18:50:54 UTC (rev 265035)
@@ -0,0 +1,63 @@
+# 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_>
+
+_pkg=netCDF4
+pkgbase=python-${_pkg,,}
+pkgname=("python-${_pkg,,}" "python2-${_pkg,,}")
+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"
+ 'fix-cdf5-test.patch')
+sha256sums=('570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957'
+ '5b300628ce1c22cdd58062196f3a410f673e568c04a35450baf3e75505734efc')
+
+prepare() {
+ cd ${_pkg}-${pkgver}
+ patch -p1 -i ../fix-cdf5-test.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
+ 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
+}
+
+package_python-netcdf4() {
+ depends=('python-numpy' 'netcdf')
+
+ cd ${_pkg}-${pkgver}
+ USE_NCCONFIG=1 python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=2
+
+ rm -r "${pkgdir}"/usr/bin
+ install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
+ install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}
+
+package_python2-netcdf4() {
+ depends=('python2-numpy' 'netcdf')
+
+ cd ${_pkg}-${pkgver}-py2
+ USE_NCCONFIG=1 python2 setup.py install --prefix=/usr --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}
+}
Copied: python-netcdf4/repos/community-staging-i686/fix-cdf5-test.patch (from rev 265034, python-netcdf4/trunk/fix-cdf5-test.patch)
===================================================================
--- community-staging-i686/fix-cdf5-test.patch (rev 0)
+++ community-staging-i686/fix-cdf5-test.patch 2017-11-01 18:50:54 UTC (rev 265035)
@@ -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, \
+
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2017-11-01 18:50:14 UTC (rev 265034)
+++ community-staging-x86_64/PKGBUILD 2017-11-01 18:50:54 UTC (rev 265035)
@@ -1,58 +0,0 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <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_>
-
-_pkg=netCDF4
-pkgbase=python-${_pkg,,}
-pkgname=("python-${_pkg,,}" "python2-${_pkg,,}")
-pkgver=1.3.0
-pkgrel=2
-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')
-
-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
- NO_NET=1 PYTHONPATH="../build/lib.linux-${CARCH}-3.6" python -B ./run_all.py || warning "Tests failed"
-
- cd ../../${_pkg}-${pkgver}-py2/test
- PYTHONPATH="../build/lib.linux-${CARCH}-2.7" python2 -B ./run_all.py || warning "Tests failed"
-}
-
-package_python-netcdf4() {
- depends=('python-numpy' 'netcdf')
-
- cd ${_pkg}-${pkgver}
- USE_NCCONFIG=1 python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=2
-
- rm -r "${pkgdir}"/usr/bin
- install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
- install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}
-
-package_python2-netcdf4() {
- depends=('python2-numpy' 'netcdf')
-
- cd ${_pkg}-${pkgver}-py2
- USE_NCCONFIG=1 python2 setup.py install --prefix=/usr --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}
-}
Copied: python-netcdf4/repos/community-staging-x86_64/PKGBUILD (from rev 265034, python-netcdf4/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-11-01 18:50:54 UTC (rev 265035)
@@ -0,0 +1,63 @@
+# 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_>
+
+_pkg=netCDF4
+pkgbase=python-${_pkg,,}
+pkgname=("python-${_pkg,,}" "python2-${_pkg,,}")
+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"
+ 'fix-cdf5-test.patch')
+sha256sums=('570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957'
+ '5b300628ce1c22cdd58062196f3a410f673e568c04a35450baf3e75505734efc')
+
+prepare() {
+ cd ${_pkg}-${pkgver}
+ patch -p1 -i ../fix-cdf5-test.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
+ 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
+}
+
+package_python-netcdf4() {
+ depends=('python-numpy' 'netcdf')
+
+ cd ${_pkg}-${pkgver}
+ USE_NCCONFIG=1 python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=2
+
+ rm -r "${pkgdir}"/usr/bin
+ install -Dm644 docs/netCDF4/* -t "${pkgdir}"/usr/share/doc/${pkgname}/docs/netCDF4
+ install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}
+
+package_python2-netcdf4() {
+ depends=('python2-numpy' 'netcdf')
+
+ cd ${_pkg}-${pkgver}-py2
+ USE_NCCONFIG=1 python2 setup.py install --prefix=/usr --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}
+}
Copied: python-netcdf4/repos/community-staging-x86_64/fix-cdf5-test.patch (from rev 265034, python-netcdf4/trunk/fix-cdf5-test.patch)
===================================================================
--- community-staging-x86_64/fix-cdf5-test.patch (rev 0)
+++ community-staging-x86_64/fix-cdf5-test.patch 2017-11-01 18:50:54 UTC (rev 265035)
@@ -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, \
+
More information about the arch-commits
mailing list