Recover nestle, fix for new numpy

1 files changed, 21 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3a3f66695f4a..fbebbc382a4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,44 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-nestle
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}")
+pkgname=("python-${_pyname}")
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Nested sampling algorithms for evaluating Bayesian evidence"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://kylebarbary.com/nestle/"
 license=('MIT')
-makedepends=('python-setuptools' 'python2-setuptools')
-source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('49e14a2fc989ced42db7f0c411162e00')
+makedepends=('python-setuptools')
+#            'python-wheel'
+#            'python-build'
+#            'python-installer'
+checkdepends=('python-pytest'
+              'python-numpy')
+source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
+        "${pkgver}-runtest.py::https://github.com/kbarbary/nestle/raw/v${pkgver}/runtests.py")
+md5sums=('49e14a2fc989ced42db7f0c411162e00'
+         '5173344e73e9b33ef77d40bbabb729f5')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+    ln -rs {${srcdir}/${pkgver}-,}runtest.py
+    sed -i -e "s/np.int/int/" -e "s/np.float)/np.float64)/" nestle.py
 }
 
 build() {
-    msg "Building Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py build
-
-    msg "Building Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
+
     python setup.py build
+#   python -m build --wheel --no-isolation
 }
 
 check() {
-    msg "Checking Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py test
-
-    msg "Checking Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py test
-}
 
-package_python2-nestle() {
-    depends=('python2-numpy>=1.6')
-    optdepends=('python2-scipy'
-                'python-nestle-doc: Documentation for Nestle')
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-
-    install -D -m644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+#   nosetests -v -x || warning "Tests failed"
+    pytest runtest.py || warning "Tests failed" # -vv -l -ra --color=yes -o console_output_style=count
+#   PYTHONPATH="build/lib" python runtest.py
 }
 
 package_python-nestle() {
@@ -58,4 +50,5 @@ package_python-nestle() {
     install -D -m644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
     python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+#   python -m installer --destdir="${pkgdir}" dist/*.whl
 }