[arch-commits] Commit in python-pyopencl/trunk (PKGBUILD)

[Santiago Torres-Arias via arch-commits]

    Date: Tuesday, November 27, 2018 @ 01:29:09
  Author: sangy
Revision: 409904

upgpkg: python-pyopencl 1:2018.2-1

upgpkg 1:2018.2-1, PKGBUILD cleanups and enable test suite

Modified:
  python-pyopencl/trunk/PKGBUILD

----------+
 PKGBUILD |   78 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-11-26 23:22:20 UTC (rev 409903)
+++ PKGBUILD    2018-11-27 01:29:09 UTC (rev 409904)
@@ -1,11 +1,11 @@
-# Maintianer:
+# Maintianer: Santiago Torres-Arias <santi...@archlinux.org>
 # Contributor: Stéphane Gaudreault <steph...@archlinux.org>
 
 _pypiname=pyopencl
 pkgbase=python-pyopencl
 pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
-pkgver=2018.1.1
-pkgrel=3
+pkgver=2018.2
+pkgrel=1
 epoch=1
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('x86_64')
@@ -13,59 +13,59 @@
 license=('MIT' 'Apache' 'BSD')
 depends=('opencl-icd-loader' 'opencl-headers' 'mesa' 'boost-libs')
 makedepends=('ctags' 'boost' 'python-setuptools' 'python2-setuptools' 
'python-mako' 'python2-mako'
-             'python-numpy' 'python2-numpy' 'python-cffi' 'python2-cffi')
-checkdepends=('python-six' 'python2-six' 'python-appdirs' 'python2-appdirs')
-source=("https://pypi.io/packages/source/p/$_pypiname/$_pypiname-${pkgver}.tar.gz";)
-sha1sums=('40d036172fd4367a0243356a617c5f91bee1f3cc')
+             'python-numpy' 'python2-numpy' 'python-cffi' 'python2-cffi' 'git' 
'pybind11')
+ checkdepends=('python-six' 'python2-six' 'python-appdirs' 'python2-appdirs')
+source=("git+https://github.com/inducer/pyopencl.git?signed#tag=v${pkgver}";)
+validpgpkeys=("900A958D9A0ACA58B1468F2471AA298BCA171145") # Andreas Ratchke
+sha1sums=('SKIP')
 
 build() {
-   cp -a pyopencl-$pkgver{,-python2}
+    # we use git clone here to ensure the submodules intialize properly
+    # FIXME: I could do something more thorough later down the line
+    git clone pyopencl{,-python2}
+ 
+    cd "pyopencl"
+    python3 ./configure.py --python-exe=python3 --cl-pretend-version=1.2 # 
--boost-python-libname=boost_python3
+    make
+ 
+    cd "${srcdir}/pyopencl-python2"
+    python2 ./configure.py  --python-exe=python2 --cl-pretend-version=1.2 # 
--boost-python-libname=boost_python
+    make
+}
 
-   cd pyopencl-${pkgver}
-   python3 ./configure.py --cl-enable-gl --python-exe=python3 
--cl-pretend-version=1.2 # --boost-python-libname=boost_python3
-   make
+check(){
+    cd pyopencl
+    make tests
 
-   cd "$srcdir/pyopencl-$pkgver-python2"
-   python2 ./configure.py --cl-enable-gl --python-exe=python2 
--cl-pretend-version=1.2 # --boost-python-libname=boost_python
-   make
+    cd "$srcdir/pyopencl-python2"
+    make tests
 }
 
-#check(){
-#   cd pyopencl-${pkgver}
-#   python3 setup.py test
-#
-#   cd "$srcdir/pyopencl-$pkgver-python2"
-#   python2 setup.py test
-#}
-
 package_python-pyopencl() {
-   depends+=('python' 'python-numpy' 'python-mako' 'python-pytools' 
'pyopencl-headers' 'python-setuptools' 'python-cffi')
+    depends+=('python' 'python-numpy' 'python-mako' 'python-pytools' 
'pyopencl-headers' 'python-setuptools' 'python-cffi')
 
-   cd pyopencl-${pkgver}
-   python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 
--skip-build
+    cd pyopencl
+    python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 
--skip-build
 
-   rm -fr "${pkgdir}"/usr/include
+    rm -fr "${pkgdir}"/usr/include
 
-   install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+    install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_python2-pyopencl() {
-   depends+=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 
'pyopencl-headers' 'python2-setuptools' 'python2-cffi')
+    depends+=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 
'pyopencl-headers' 'python2-setuptools' 'python2-cffi')
 
-   cd pyopencl-${pkgver}-python2
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 
--skip-build
+    cd pyopencl-python2
+    python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 
--skip-build
 
-    rm -fr "${pkgdir}"/usr/include/
+    rm -fr "${pkgdir}/usr/include/"
 
-   install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+    install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_pyopencl-headers() {
-   cd pyopencl-${pkgver}
-   install -dm755 "${pkgdir}"/usr/include/pyopencl
-
-  for file in pyopencl-airy.cl  pyopencl-bessel-j.cl  pyopencl-bessel-y.cl  
pyopencl-complex.h  pyopencl-eval-tbl.cl  pyopencl-ranluxcl.cl; do
-      install -m644 pyopencl/cl/${file} "${pkgdir}"/usr/include/pyopencl
-   done
-   install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+    cd pyopencl
+ 
+    install -Dm644 pyopencl/cl/*.cl -t "${pkgdir}"/usr/include/pyopencl 
+    install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }