Tag v0.2.1

2 files changed, 67 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 542a300020a0..e3044839c031 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,38 @@
-pkgbase = python-piff
+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 = r547.8b170e4
+	pkgver = v0.2.1.r0.00ce142
 	pkgrel = 1
-	url = https://github.com/rmjarvis/Piff
+	url = https://github.com/rmjarvis/Piff.git
 	arch = any
 	license = BSD
 	makedepends = git
-	depends = python
-	depends = libffi
-	depends = python-cffi
-	depends = python-treecorr
-	source = python-piff-r547.8b170e4::git+https://github.com/rmjarvis/Piff
+	makedepends = python
+	makedepends = libffi
+	makedepends = python-cffi
+	makedepends = python-numpy
+	makedepends = python-scipy
+	makedepends = python-pyaml
+	makedepends = python-treecorr-git
+	makedepends = python-fitsio-git
+	makedepends = python-scikit-learn
+	makedepends = python-lmfit
+	makedepends = python-matplotlib
+	makedepends = python2
+	makedepends = python2-cffi
+	makedepends = python2-numpy
+	makedepends = python2-scipy
+	makedepends = python2-pyaml
+	makedepends = python2-treecorr-git
+	makedepends = python2-fitsio-git
+	makedepends = python2-scikit-learn
+	makedepends = python2-lmfit
+	makedepends = python2-matplotlib
+	source = python-piff-git::git+https://github.com/rmjarvis/Piff.git#tag=v0.2.1
 	md5sums = SKIP
 
 pkgname = python-piff
+	depends = python
+
+pkgname = python2-piff
+	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index 83b6d8be31b2..7564bc114505 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,53 +5,58 @@
 
 # Maintainer: Andres Alejandro Navarro Alsina <aanavarroa@unal.edu.co>
 # Contributor: M. Jarvis 
-pkgname=python-piff
-pkgver=r547.8b170e4
+pkgbase=python-piff-git
+pkgname=('python-piff' 'python2-piff')
+pkgver=v0.2.1.r0.00ce142
 pkgrel=1
-#epoch=
-
 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')
-groups=()
-depends=('python' 'libffi' 'python-cffi' 'python-treecorr')
-makedepends=('git')
-checkdepends=()
-optdepends=()
-#provides=()
-#conflicts=()
-#replaces=()
-#backup=()
-options=()
-install=
-changelog=
-source=("$pkgname-$pkgver::git+${url}")
-#noextract=()
+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}#tag=v0.2.1")
 md5sums=('SKIP')
-#validpgpkeys=()
 
+pkgver() {
+  	 cd "${pkgbase}"
+ 	 printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+}
 
-build() {
-	cd "$src"	
-	cd "$pkgname-$pkgver"
-	python setup.py build
+prepare() {
+	  cp -a $pkgbase{,-py2}
 }
 
+build() {
+	cd "$srcdir"/$pkgbase
+	python setup.py build
 
-pkgver() {
-  cd "$pkgname-$pkgver"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd  "$srcdir"/$pkgbase-py2
+	python2 setup.py build
 }
 
+check() {
+	cd "$srcdir"/$pkgbase/tests
+	nosetests -v || warning 'Tests failed'
 
-package() {
-	cd "$src"
-	cd "$pkgname-$pkgver"
-	python setup.py install --root=${pkgdir} --prefix=/usr
+	cd "$srcdir"/$pkgbase-py2/tests
+	nosetests2 -v || warning 'Tests failed'
+}
 
+package_python-piff() {
+	  		  depends=('python')
+	  		  cd $pkgbase
+	  		  python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+			  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
+
+package_python2-piff() {
+	  		  depends=('python2')
+	  		  cd $pkgbase-py2
+			  python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+			  #mv "$pkgdir"/usr/bin/piffify{,2} 
+			  #mv "$pkgdir"/usr/bin/plotify{,2}
+			  #rm -rf "$pkgdir"/usr/bin
+			  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+}
\ No newline at end of file