rewrite

2 files changed, 32 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe4f705567db..bcd875913e2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,26 @@
 pkgbase = python-hep_ml
 	pkgdesc = Specific machine learning tools for purposes of high energy physics
 	pkgver = 0.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://arogozhnikov.github.io/hep_ml/
 	arch = any
 	license = Apache
-	makedepends = cython2
-	makedepends = cython
-	makedepends = python2-numpy
-	makedepends = python-numpy
-	makedepends = python2-scikit-learn
-	makedepends = python-scikit-learn
-	makedepends = python2-scipy
-	makedepends = python-scipy
+	checkdepends = python2-nose
+	checkdepends = python-nose
+	checkdepends = python2-numpy
+	checkdepends = python-numpy
+	checkdepends = python2-scikit-learn
+	checkdepends = python-scikit-learn
+	checkdepends = python2-scipy
+	checkdepends = python-scipy
+	checkdepends = python2-six
+	checkdepends = python-six
+	checkdepends = python2-pandas
+	checkdepends = python-pandas
+	checkdepends = python2-theano
+	checkdepends = python-theano
 	makedepends = python2-setuptools
 	makedepends = python-setuptools
-	makedepends = python2-six
-	makedepends = python-six
-	makedepends = python2-pandas
-	makedepends = python-pandas
-	makedepends = python2-theano
-	makedepends = python-theano
-	options = !emptydirs
 	source = https://github.com/arogozhnikov/hep_ml/archive/v0.6.0.zip
 	sha256sums = 722cf5249d1c9b027bc8de54d7ffd6b3eb4730985b273cb8dd99753198ea1711
 
diff --git a/PKGBUILD b/PKGBUILD
index c175673197d7..8b9431b00ae2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,19 @@ pkgbase=python-hep_ml
 _pkgbase=hep_ml
 pkgname=('python2-hep_ml' 'python-hep_ml')
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Specific machine learning tools for purposes of high energy physics"
 arch=('any')
 url="https://arogozhnikov.github.io/hep_ml/"
 license=('Apache')
-makedepends=('cython2' 'cython'
-             'python2-numpy' 'python-numpy'
-             'python2-scikit-learn' 'python-scikit-learn'
-             'python2-scipy' 'python-scipy'
-             'python2-setuptools' 'python-setuptools'
-             'python2-six' 'python-six'
-             'python2-pandas' 'python-pandas'
-             'python2-theano' 'python-theano')
-options=(!emptydirs)
-
+makedepends=('python2-setuptools' 'python-setuptools')
+checkdepends=('python2-nose' 'python-nose'
+              'python2-numpy' 'python-numpy'
+              'python2-scikit-learn' 'python-scikit-learn'
+              'python2-scipy' 'python-scipy'
+              'python2-six' 'python-six'
+              'python2-pandas' 'python-pandas'
+              'python2-theano' 'python-theano')
 source=("https://github.com/arogozhnikov/${_pkgbase}/archive/v${pkgver}.zip")
 sha256sums=('722cf5249d1c9b027bc8de54d7ffd6b3eb4730985b273cb8dd99753198ea1711')
 
@@ -35,23 +33,27 @@ prepare() {
 }
 
 build() {
-  msg2 "Building Python2"
   cd "${srcdir}/hep_ml-py2-${pkgver}"
   python2 setup.py build
 
-  msg2 "Building Python3"
   cd "${srcdir}/hep_ml-${pkgver}"
   python setup.py build
 }
 
+check() {
+  cd "${srcdir}/hep_ml-py2-${pkgver}"
+  nosetests2 tests
+
+  cd "${srcdir}/hep_ml-${pkgver}"
+  nosetests tests
+}
+
 package_python2-hep_ml() {
   depends=('python2-numpy' 'python2-scikit-learn' 'python2-scipy' 'python2-six' 'python2-pandas' 'python2-theano')
   cd "${srcdir}/hep_ml-py2-${pkgver}"
 
   python2 setup.py install --root="${pkgdir}/" --optimize=1
 
-  install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
   install -d "${pkgdir}/usr/share/doc/${pkgname}"
   cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
 }
@@ -62,9 +64,6 @@ package_python-hep_ml() {
 
   python setup.py install --root="${pkgdir}/" --optimize=1
 
-  install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # See FS#49651
   install -d "${pkgdir}/usr/share/doc/${pkgname}"
   cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/"
 }