Recover testing

2 files changed, 40 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6f9bc4ecd31..d20cf8574bd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Sat Dec  8 08:11:45 UTC 2018
 pkgbase = python-naima
 	pkgdesc = Derivation of non-thermal particle distributions through MCMC spectral fitting
 	pkgver = 0.8.3
@@ -8,35 +6,39 @@ pkgbase = python-naima
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = cython
-	makedepends = cython2
+	checkdepends = python-pytest-astropy
+	checkdepends = python2-pytest<3.7
+	checkdepends = python2-astropy
+	checkdepends = python-corner
+	checkdepends = python2-corner
+	checkdepends = python-yaml
+	checkdepends = python2-yaml
+	checkdepends = python2-emcee
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
 	makedepends = python-astropy
 	makedepends = python-astropy-helpers>=3.1
 	makedepends = python2-astropy-helpers
-	makedepends = python-sphinx
 	makedepends = python-sphinx-astropy
 	makedepends = python-emcee
 	source = https://files.pythonhosted.org/packages/source/n/naima/naima-0.8.3.tar.gz
 	md5sums = 3970fed9996826054774fe770a959736
 
 pkgname = python-naima
-	depends = python
-	depends = python-scipy
-	depends = python-matplotlib
+	depends = python>=3.5
 	depends = python-astropy>=1.0.2
 	depends = python-emcee>=2.2.0
 	depends = python-corner
+	optdepends = python-sherpa: For using Sherpa models
 	optdepends = python-naima-doc: Documentation for Naima
 	optdepends = python-pytest: For testing
 
 pkgname = python2-naima
-	depends = python2
-	depends = python2-scipy
-	depends = python2-matplotlib
+	depends = python2>=2.7
 	depends = python2-astropy>=1.0.2
 	depends = python2-emcee>=2.2.0
 	depends = python2-corner
-	optdepends = python2-sherpa
+	optdepends = python2-sherpa: For using Sherpa models
 	optdepends = python-naima-doc: Documentation for Naima
 	optdepends = python2-pytest<3.7: For testing
 
diff --git a/PKGBUILD b/PKGBUILD
index 94a2f57702f5..8394de55c9be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,54 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-naima
-pkgname=('python-naima' 'python2-naima' 'python-naima-doc')
+_pyname=${pkgbase#python-}
+pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
 pkgver=0.8.3
 pkgrel=1
 pkgdesc="Derivation of non-thermal particle distributions through MCMC spectral fitting"
 arch=('i686' 'x86_64')
 url="https://naima.readthedocs.io/en/latest/"
 license=('BSD')
-makedepends=('cython' 'cython2' 'python-astropy' 'python-astropy-helpers>=3.1' 'python2-astropy-helpers' 'python-sphinx' 'python-sphinx-astropy' 'python-emcee')
-#checkdepends=('python-pytest-astropy' 'python2-pytest' 'python2-astropy' 'python-corner' 'python2-corner' 'python-emcee' 'python2-emcee')
-source=("https://files.pythonhosted.org/packages/source/n/naima/naima-${pkgver}.tar.gz")
+makedepends=('python-setuptools' 'python2-setuptools' 'python-astropy' 'python-astropy-helpers>=3.1' 'python2-astropy-helpers' 'python-sphinx-astropy' 'python-emcee')
+checkdepends=('python-pytest-astropy' 'python2-pytest<3.7' 'python2-astropy' 'python-corner' 'python2-corner' 'python-yaml' 'python2-yaml' 'python2-emcee')
+source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
 md5sums=('3970fed9996826054774fe770a959736')
 
 prepare() {
-    cd ${srcdir}/naima-${pkgver}
+    cd ${srcdir}/${_pyname}-${pkgver}
     sed -i -e '/auto_use/s/True/False/' setup.cfg
 
-    cp -a ${srcdir}/naima-${pkgver}{,-py2}
+    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
 }
 
 build() {
     msg "Building Python2"
-    cd ${srcdir}/naima-${pkgver}-py2
+    cd ${srcdir}/${_pyname}-${pkgver}-py2
     python2 setup.py build --use-system-libraries --offline
 
     msg "Building Python3"
-    cd ${srcdir}/naima-${pkgver}
+    cd ${srcdir}/${_pyname}-${pkgver}
     python setup.py build --use-system-libraries --offline
 
     msg "Building Docs"
     python setup.py build_docs
 }
 
-#check() {
-#    cd ${srcdir}/naima-${pkgver}
-#    python setup.py test
-#
-#    cd ${srcdir}/naima-${pkgver}-py2
-#    python2 setup.py test
-#}
+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-naima() {
-    depends=('python2' 'python2-scipy' 'python2-matplotlib' 'python2-astropy>=1.0.2' 'python2-emcee>=2.2.0' 'python2-corner')
-    optdepends=('python2-sherpa'
+    depends=('python2>=2.7' 'python2-astropy>=1.0.2' 'python2-emcee>=2.2.0' 'python2-corner')
+    optdepends=('python2-sherpa: For using Sherpa models'
                 'python-naima-doc: Documentation for Naima'
                 'python2-pytest<3.7: For testing')
-    cd ${srcdir}/naima-${pkgver}-py2
+    cd ${srcdir}/${_pyname}-${pkgver}-py2
 
     install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
@@ -53,10 +56,11 @@ package_python2-naima() {
 }
 
 package_python-naima() {
-    depends=('python' 'python-scipy' 'python-matplotlib' 'python-astropy>=1.0.2' 'python-emcee>=2.2.0' 'python-corner')
-    optdepends=('python-naima-doc: Documentation for Naima'
+    depends=('python>=3.5' 'python-astropy>=1.0.2' 'python-emcee>=2.2.0' 'python-corner')
+    optdepends=('python-sherpa: For using Sherpa models'
+                'python-naima-doc: Documentation for Naima'
                 'python-pytest: For testing')
-    cd ${srcdir}/naima-${pkgver}
+    cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
@@ -65,7 +69,7 @@ package_python-naima() {
 
 package_python-naima-doc() {
     pkgdesc="Documentation for Python Naima module"
-    cd ${srcdir}/naima-${pkgver}/docs/_build
+    cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
     cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"