Warning seem python-fitsio seems a bussy git repo. other packages will point to this pkg-git version.

2 files changed, 31 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efcc08a92b1d..968b3e380821 100644..100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,31 @@
 pkgbase = python-fitsio-git
 	pkgdesc = A python library to read from and write to FITS files.
-	pkgver = v0.9.12rc1.r22.507ad1c
+	pkgver = v0.9.12.r38.gcff2588
 	pkgrel = 1
 	url = https://github.com/esheldon/fitsio.git
 	arch = i686
 	arch = x86_64
 	license = BSD
+	checkdepends = python-numpy
+	checkdepends = python2-numpy
+	checkdepends = python-nose
+	checkdepends = python2-nose
+	checkdepends = bzip2
 	makedepends = git
 	makedepends = python
 	makedepends = python2
 	makedepends = python2-setuptools
 	makedepends = python-setuptools
+	makedepends = python-numpy
+	makedepends = python2-numpy
 	source = python-fitsio::git+https://github.com/esheldon/fitsio.git
 	md5sums = SKIP
 
 pkgname = python-fitsio-git
-	depends = python
+	depends = python-numpy
+	depends = curl
 
 pkgname = python2-fitsio-git
-	depends = python2
+	depends = python2-numpy
+	depends = curl
 
diff --git a/PKGBUILD b/PKGBUILD
index af5cc5ed2fed..05ecac0ca0a0 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,53 +3,59 @@
 _pkgname=python-fitsio
 pkgbase=python-fitsio-git
 pkgname=("python-fitsio-git" "python2-fitsio-git")
-pkgver=v0.9.12rc1.r22.507ad1c
+pkgver=v0.9.12.r38.gcff2588
 pkgrel=1
 pkgdesc=" A python library to read from and write to FITS files. "
 arch=('i686' 'x86_64')
 url="https://github.com/esheldon/fitsio.git"
 license=('BSD')
-makedepends=('git' 'python' 'python2' 'python2-setuptools' 'python-setuptools')
+makedepends=('git' 'python' 'python2' 'python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy')
+checkdepends=('python-numpy' 'python2-numpy' 'python-nose' 'python2-nose' 'bzip2')
 source=("${_pkgname}::git+${url}")
 md5sums=('SKIP')
 
 prepare() {
 	  cp -a $_pkgname{,-py2}
+	  cd "$srcdir"/$_pkgname	  
 }
 
 pkgver() {
 	 cd  $_pkgname
-	 printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+	 #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')"
 }
 
 build() {
 	cd "$srcdir"/$_pkgname
-	python setup.py build
+	python setup.py build_py build_clib build_scripts 
 
 	cd "$srcdir"/$_pkgname-py2
-	python2 setup.py build
+	python2 setup.py build_py build_clib build_scripts 
 }
 
 check() {
 	cd "$srcdir"/$_pkgname/fitsio
+	nosetests -v || warning 'Tests failed'
 	python test.py || warning 'Tests failed'
-	
+
 	cd "$srcdir"/$_pkgname-py2/fitsio
-	python2 test.py || warning 'Tests failed'
+	nosetests2 -v || warning 'Tests2 failed'
+	python2 test.py || warning 'Tests2 failed'
+	
+	#cd "$srcdir"/$_pkgname
+	#python setup.py test || warning 'Tests failed'
 }
 
 package_python-fitsio-git() {
-			    depends=('python')	    
+			    depends=('python-numpy' 'curl')	    
 			    cd "$srcdir"/$_pkgname
 			    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-			    install -Dm644 gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
+			    install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-fitsio-git() {
-			     depends=('python2')
+			     depends=('python2-numpy' 'curl')
      			     cd "$srcdir"/$_pkgname-py2
 	  		     python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-	  		     install -Dm644 gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
+	  		     install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }