clean chroot, nosetest not runnnin during building

2 files changed, 34 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02c93829a25e..70ba6ef943db 100644..100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,42 @@
 pkgbase = python-treecorr-git
 	pkgdesc = A package for efficiently computing 2-point and 3-point correlation functions
-	pkgver = v3.3.7.r0.26d4169
+	pkgver = v3.3.11.r0.fe0e875
 	pkgrel = 1
 	url = https://github.com/rmjarvis/TreeCorr.git
 	arch = i686
 	arch = x86_64
 	license = BSD
+	checkdepends = python-nose
+	checkdepends = python2-nose
 	makedepends = git
 	makedepends = python-numpy
 	makedepends = python2-numpy
+	makedepends = python-future
+	makedepends = python-pandas
+	makedepends = python-yaml
+	makedepends = python-cffi
+	makedepends = python2-future
+	makedepends = python2-pandas
+	makedepends = python2-yaml
+	makedepends = python2-cffi
+	makedepends = python-fitsio-git
+	makedepends = python2-fitsio-git
 	source = python-treecorr::git+https://github.com/rmjarvis/TreeCorr.git
 	md5sums = SKIP
 
 pkgname = python-treecorr-git
-	depends = python
+	depends = python-numpy
+	depends = python-future
+	depends = python-pandas
+	depends = python-yaml
+	depends = python-cffi
+	depends = python-fitsio-git
 
 pkgname = python2-treecorr-git
-	depends = python2
+	depends = python2-numpy
+	depends = python2-future
+	depends = python-pandas
+	depends = python2-yaml
+	depends = python2-cffi
+	depends = python2-fitsio-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 476d0041c8fd..89102dcbe7c0 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,20 @@
 _pkgname=python-treecorr
 pkgbase=python-treecorr-git
 pkgname=('python-treecorr-git' 'python2-treecorr-git')
-pkgver=v3.3.7.r0.26d4169
+pkgver=v3.3.11.r0.fe0e875
 pkgrel=1
 pkgdesc="A package for efficiently computing 2-point and 3-point correlation functions "
 arch=('i686' 'x86_64')
 url="https://github.com/rmjarvis/TreeCorr.git"
 license=('BSD')
-makedepends=('git' 'python-numpy' 'python2-numpy')
-checkdepends=()
+makedepends=('git' 'python-numpy' 'python2-numpy' 'python-future' 'python-pandas' 'python-yaml' 'python-cffi' 'python2-future' 'python2-pandas' 'python2-yaml' 'python2-cffi' 'python-fitsio-git' 'python2-fitsio-git')
+checkdepends=('python-nose' 'python2-nose')
 source=("${_pkgname}::git+${url}")
 md5sums=('SKIP')
 
 pkgver() {
 	 cd $_pkgname
-	 printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+	 printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 prepare() {
@@ -37,21 +37,23 @@ build() {
 
 check() {
 	cd "$srcdir"/$_pkgname/tests
+	#python setup.py test || warning 'Tests failed'
 	nosetests -v || warning 'Tests failed'
 	
 	cd "$srcdir"/$_pkgname-py2/tests
-	nosetests2 -v || warning 'Tests failed'
+	#python2 setup.py test || warning 'Tests2 failed'
+	nosetests2 -v || warning 'Tests2 failed'
 }
 
 package_python-treecorr-git() {
-			      depends=('python')
+			      depends=('python-numpy' 'python-future' 'python-pandas' 'python-yaml' 'python-cffi' 'python-fitsio-git')
 	  		      cd "${_pkgname}"
 	  		      python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 	  		      install -Dm644 TreeCorr_LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-treecorr-git() {
-			       depends=('python2')
+			       depends=('python2-numpy' 'python2-future' 'python-pandas' 'python2-yaml' 'python2-cffi' 'python2-fitsio-git')
 			       cd "${_pkgname}"
 	  		       python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 			       mv ${pkgdir}/usr/bin/corr2 ${pkgdir}/usr/bin/corr2_py2