rewrite

2 files changed, 53 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b607a8ef8ab..a5b2e828c888 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 pkgbase = python-root_numpy
 	pkgdesc = The interface between ROOT and NumPy
 	pkgver = 4.7.3
-	pkgrel = 2
+	pkgrel = 3
 	url = http://scikit-hep.org/root_numpy/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = python2-setuptools
-	makedepends = python-setuptools
+	checkdepends = python2-nose
+	checkdepends = python-nose
+	checkdepends = root
 	makedepends = cython2
+	makedepends = python-numpy
+	makedepends = python2-setuptools
 	makedepends = cython
 	makedepends = python2-numpy
-	makedepends = python-numpy
+	makedepends = python-setuptools
 	makedepends = root
-	options = !emptydirs
 	source = https://github.com/scikit-hep/root_numpy/archive/4.7.3.zip
 	sha256sums = 62f467ffad6608566c943b8dffea212e12caccc96155e81ba451a1034adf1f33
 
diff --git a/PKGBUILD b/PKGBUILD
index 9bf1e0f59fb8..2324cf43ac6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,66 +4,75 @@ pkgbase=python-root_numpy
 _pkgbase=root_numpy
 pkgname=('python2-root_numpy' 'python-root_numpy')
 pkgver=4.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The interface between ROOT and NumPy"
 arch=('i686' 'x86_64')
 url="http://scikit-hep.org/root_numpy/"
 license=('BSD')
-makedepends=('python2-setuptools' 'python-setuptools' 'cython2' 'cython'
-             'python2-numpy' 'python-numpy' 'root')
-options=(!emptydirs)
-
+makedepends=('cython2' 'python-numpy' 'python2-setuptools'
+             'cython' 'python2-numpy' 'python-setuptools' 'root')
+checkdepends=('python2-nose' 'python-nose' 'root')
 source=("https://github.com/scikit-hep/${_pkgbase}/archive/${pkgver}.zip")
 sha256sums=('62f467ffad6608566c943b8dffea212e12caccc96155e81ba451a1034adf1f33')
 
 prepare() {
-  cd "${srcdir}"
-  cp -a "root_numpy-${pkgver}" "root_numpy-py2-${pkgver}"
-  cd "root_numpy-py2-${pkgver}"
+    cd "${srcdir}"
+    cp -a "root_numpy-${pkgver}" "root_numpy-py2-${pkgver}"
+    cd "root_numpy-py2-${pkgver}"
 
-  find . -name '*.py' -type f -exec \
-      sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-          -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-          -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-          -i '{}' \; -print
+    find . -name '*.py' -type f -exec \
+        sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+            -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+            -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+            -i '{}' \; -print
 }
 
 build() {
-  msg2 "Building Python2"
-  cd "${srcdir}/root_numpy-py2-${pkgver}"
-  python2 setup.py build
+    cd "${srcdir}/root_numpy-py2-${pkgver}"
+    cython2 root_numpy/src/_librootnumpy.pyx --embed --cplus -o root_numpy/src/_librootnumpy.cpp
+    cython2 root_numpy/tmva/src/_libtmvanumpy.pyx --embed --cplus -o root_numpy/tmva/src/_libtmvanumpy.cpp
+    python2 setup.py build_ext -i
+
+    cd "${srcdir}/root_numpy-${pkgver}"
+    cython root_numpy/src/_librootnumpy.pyx --embed --cplus -o root_numpy/src/_librootnumpy.cpp
+    cython root_numpy/tmva/src/_libtmvanumpy.pyx --embed --cplus -o root_numpy/tmva/src/_libtmvanumpy.cpp
+    python setup.py build_ext -i
+}
+
+check() {
+    # cd "${srcdir}/root_numpy-py2-${pkgver}"
+    # nosetests2 -s -v root_numpy
 
-  msg2 "Building Python3"
-  cd "${srcdir}/root_numpy-${pkgver}"
-  python setup.py build
+    cd "${srcdir}/root_numpy-${pkgver}"
+    nosetests -s -v root_numpy
 }
 
 package_python2-root_numpy() {
-  depends=('python2-numpy' 'root')
-  cd "${srcdir}/root_numpy-py2-${pkgver}"
+    depends=('python2-numpy' 'root')
+    cd "${srcdir}/root_numpy-py2-${pkgver}"
 
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
+    python2 setup.py install --root="${pkgdir}/" --optimize=1
 
-  install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r benchmarks "${pkgdir}/usr/share/doc/${pkgname}/"
-  cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
-  cp -r examples "${pkgdir}/usr/share/doc/${pkgname}/"
-  cp -r paper "${pkgdir}/usr/share/doc/${pkgname}/"
+    install -d "${pkgdir}/usr/share/doc/${pkgname}"
+    cp -r benchmarks "${pkgdir}/usr/share/doc/${pkgname}/"
+    cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
+    cp -r examples "${pkgdir}/usr/share/doc/${pkgname}/"
+    cp -r paper "${pkgdir}/usr/share/doc/${pkgname}/"
 }
 
 package_python-root_numpy() {
-  depends=('python-numpy' 'root')
-  cd "${srcdir}/root_numpy-${pkgver}"
+    depends=('python-numpy' 'root')
+    cd "${srcdir}/root_numpy-${pkgver}"
 
-  python setup.py install --root="${pkgdir}/" --optimize=1
+    python setup.py install --root="${pkgdir}/" --optimize=1
 
-  install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r benchmarks "${pkgdir}/usr/share/doc/${pkgname}/"
-  cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
-  cp -r examples "${pkgdir}/usr/share/doc/${pkgname}/"
-  cp -r paper "${pkgdir}/usr/share/doc/${pkgname}/"
+    install -d "${pkgdir}/usr/share/doc/${pkgname}"
+    cp -r benchmarks "${pkgdir}/usr/share/doc/${pkgname}/"
+    cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
+    cp -r examples "${pkgdir}/usr/share/doc/${pkgname}/"
+    cp -r paper "${pkgdir}/usr/share/doc/${pkgname}/"
 }