clean chroot

2 files changed, 46 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04fb45461568..323974c2eb67 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,13 @@
 pkgbase = python-piff-git
 	pkgdesc = Piff is a Python software package for modeling the point-spread function (PSF) across multiple detectors in the full field of view
-	pkgver = v0.1.0.r527.250432f
+	pkgver = v0.2.5.r0.gdee19b7
 	pkgrel = 1
-	url = https://github.com/rmjarvis/Piff
+	url = https://github.com/rmjarvis/Piff.git
 	arch = any
 	license = BSD
+	checkdepends = python-nose
+	checkdepends = python2-nose
+	checkdepends = python-scikit-learn
 	makedepends = git
 	makedepends = python
 	makedepends = libffi
@@ -14,8 +17,7 @@ pkgbase = python-piff-git
 	makedepends = python-pyaml
 	makedepends = python-treecorr-git
 	makedepends = python-fitsio-git
-	makedepends = python-scikit-learn
-	makedepends = python-lmfit
+	makedepends = python-lmfit-git
 	makedepends = python-matplotlib
 	makedepends = python2
 	makedepends = python2-cffi
@@ -24,15 +26,38 @@ pkgbase = python-piff-git
 	makedepends = python2-pyaml
 	makedepends = python2-treecorr-git
 	makedepends = python2-fitsio-git
-	makedepends = python2-scikit-learn
-	makedepends = python2-lmfit
+	makedepends = python2-lmfit-git
 	makedepends = python2-matplotlib
-	source = python-piff-git::git+https://github.com/rmjarvis/Piff
+	makedepends = python-galsim-git
+	makedepends = python2-galsim-git
+	makedepends = python-coord-git
+	makedepends = python2-coord-git
+	optdepends = python2-scikit-learn
+	optdepends = python-piff
+	optdepends = python2-piff
+	source = python-piff-git::git+https://github.com/rmjarvis/Piff.git#tag=v0.2.5
 	md5sums = SKIP
 
 pkgname = python-piff-git
-	depends = python
+	depends = python-cffi
+	depends = python-numpy
+	depends = python-scipy
+	depends = python-pyaml
+	depends = python-treecorr-git
+	depends = python-fitsio-git
+	depends = python-lmfit-git
+	depends = python-matplotlib
+	depends = python-galsim-git
+	depends = python-coord-git
 
 pkgname = python2-piff-git
-	depends = python2
+	depends = python2-cffi
+	depends = python2-numpy
+	depends = python2-scipy
+	depends = python2-pyaml
+	depends = python2-treecorr-git
+	depends = python2-fitsio-git
+	depends = python2-matplotlib
+	depends = python2-galsim-git
+	depends = python2-coord-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cfd7c2629d5..df45e46fbc79 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,21 +7,23 @@
 # Contributor: M. Jarvis 
 pkgbase=python-piff-git
 pkgname=('python-piff-git' 'python2-piff-git')
-pkgver=v0.1.0.r527.250432f
+pkgver=v0.2.5.r0.gdee19b7
 pkgrel=1
 pkgdesc=" Piff is a Python software package for modeling the
 point-spread function (PSF) across multiple detectors in the full
 field of view"
 arch=('any')
-url="https://github.com/rmjarvis/Piff"
+url="https://github.com/rmjarvis/Piff.git"
 license=('BSD')
-makedepends=('git' 'python' 'libffi' 'python-cffi' 'python-numpy' 'python-scipy' 'python-pyaml' 'python-treecorr-git' 'python-fitsio-git' 'python-scikit-learn' 'python-lmfit' 'python-matplotlib' 'python2' 'python2-cffi' 'python2-numpy' 'python2-scipy' 'python2-pyaml' 'python2-treecorr-git' 'python2-fitsio-git' 'python2-scikit-learn' 'python2-lmfit' 'python2-matplotlib' )
-source=("${pkgbase}::git+${url}")
+makedepends=('git' 'python' 'libffi' 'python-cffi' 'python-numpy' 'python-scipy' 'python-pyaml' 'python-treecorr-git' 'python-fitsio-git' 'python-lmfit-git' 'python-matplotlib' 'python2' 'python2-cffi' 'python2-numpy' 'python2-scipy' 'python2-pyaml' 'python2-treecorr-git' 'python2-fitsio-git' 'python2-lmfit-git' 'python2-matplotlib' 'python-galsim-git' 'python2-galsim-git' 'python-coord-git' 'python2-coord-git')
+optdepends=('python2-scikit-learn' 'python-piff' 'python2-piff')
+checkdepends=('python-nose' 'python2-nose' 'python-scikit-learn' )
+source=("${pkgbase}::git+${url}#tag=v0.2.5")
 md5sums=('SKIP')
 
 pkgver() {
   	 cd "${pkgbase}"
- 	 printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+ 	 printf "%s" "$(git describe --long | sed 's/^foo-//;s/\([^-]*-g\)/r\1/;s/-/./g')"	 
 }
 
 prepare() {
@@ -37,22 +39,22 @@ build() {
 }
 
 check() {
-	cd "$srcdir"/$pkgbase/tests
+	cd "$srcdir"/$pkgbase
 	nosetests -v || warning 'Tests failed'
 
-	cd "$srcdir"/$pkgbase-py2/tests
-	nosetests2 -v || warning 'Tests failed'
+	cd "$srcdir"/$pkgbase-py2
+	nosetests2 -v || warning 'Tests2 failed'
 }
 
 package_python-piff-git() {
-	  		  depends=('python')
+	  		  depends=('python-cffi' 'python-numpy' 'python-scipy' 'python-pyaml' 'python-treecorr-git' 'python-fitsio-git' 'python-lmfit-git' 'python-matplotlib' 'python-galsim-git' 'python-coord-git')
 	  		  cd $pkgbase
 	  		  python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 			  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-piff-git() {
-	  		  depends=('python2')
+	  		  depends=('python2-cffi' 'python2-numpy' 'python2-scipy' 'python2-pyaml' 'python2-treecorr-git' 'python2-fitsio-git' 'python2-matplotlib' 'python2-galsim-git' 'python2-coord-git')
 	  		  cd $pkgbase-py2
 			  python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 			  #mv "$pkgdir"/usr/bin/piffify{,2}