clean chroot

2 files changed, 35 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2792c1fc923c..edf798c2c5c3 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,41 @@
 pkgbase = python-ngmix-git
 	pkgdesc = Gaussian mixture models and other code for working with for 2d images, implemented in python
-	pkgver = v1.2.r1.402f4f8
+	pkgver = v1.2.1.r2.dba6286
 	pkgrel = 1
-	url = https://github.com/esheldon/ngmix
+	url = https://github.com/esheldon/ngmix.git
+	arch = i686
 	arch = x86_64
 	license = GPL
+	checkdepends = python-nose
+	checkdepends = python2-nose
+	checkdepends = python2-galsim-git
+	checkdepends = python-galsim-git
+	checkdepends = python2-singledispatch
 	makedepends = git
 	makedepends = python
-	makedepends = python-numpy
 	makedepends = python2
+	makedepends = python-numpy
 	makedepends = python2-numpy
 	makedepends = python-numba
 	makedepends = python2-numba
-	source = python-ngmix::git+https://github.com/esheldon/ngmix
+	optdepends = python-scipy
+	optdepends = python2-scipy
+	optdepends = python-galsim-git
+	optdepends = python2-galsim-git
+	optdepends = python-scikit-learn
+	optdepends = python2-scikit-learn
+	optdepends = python-statsmodels
+	optdepends = python2-statsmodels
+	optdepends = python-emcee-git
+	optdepends = python2-emcee-git
+	source = python-ngmix::git+https://github.com/esheldon/ngmix.git
 	md5sums = SKIP
 
 pkgname = python-ngmix-git
+	depends = python-numpy
+	depends = python-numba
 
 pkgname = python2-ngmix-git
+	depends = python2-numpy
+	depends = python2-numba
 
diff --git a/PKGBUILD b/PKGBUILD
index 05f3e5e58868..c3ca5e151c0b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,15 @@
 _pkgname=python-ngmix
 pkgbase=python-ngmix-git
 pkgname=("python-ngmix-git" "python2-ngmix-git")
-pkgver=v1.2.r1.402f4f8
+pkgver=v1.2.1.r2.dba6286
 pkgrel=1
 pkgdesc=" Gaussian mixture models and other code for working with for 2d images, implemented in python "
-arch=('x86_64')
-url="https://github.com/esheldon/ngmix"
+arch=('i686' 'x86_64')
+url="https://github.com/esheldon/ngmix.git"
 license=('GPL')
-makedepends=('git' 'python' 'python-numpy' 'python2' 'python2-numpy' 'python-numba' 'python2-numba' )
+makedepends=('git' 'python' 'python2' 'python-numpy' 'python2-numpy' 'python-numba' 'python2-numba' )
+optdepends=('python-scipy' 'python2-scipy' 'python-galsim-git' 'python2-galsim-git' 'python-scikit-learn' 'python2-scikit-learn' 'python-statsmodels' 'python2-statsmodels' 'python-emcee-git' 'python2-emcee-git')
+checkdepends=('python-nose' 'python2-nose' 'python2-galsim-git' 'python-galsim-git' 'python2-singledispatch')
 source=("${_pkgname}::git+${url}")
 md5sums=('SKIP')
 
@@ -32,21 +34,23 @@ build() {
 
 check() {
 	cd "$srcdir"/$_pkgname
-	nosetests -v 
+	nosetests -v || warning 'Tests failed'
 
 	cd "$srcdir"/$_pkgname-py2
-	nosetests2 -v || warning 'Tests failed'
+	nosetests2 -v || warning 'Tests2 failed'
 
 }
 
 package_python-ngmix-git() {
+			   depends=('python-numpy' 'python-numba')
 	  		   cd "${_pkgname}"
 	  		   python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 			   install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
 }
 
-package_python2-ngmix-git() {			    
+package_python2-ngmix-git() {
+			    depends=('python2-numpy' 'python2-numba')
 	 		    cd "${_pkgname}"
 	 		    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 			    install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE