conflicts and omitting check

2 files changed, 10 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 323974c2eb67..8cf158fcc84c 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,6 +35,8 @@ pkgbase = python-piff-git
 	optdepends = python2-scikit-learn
 	optdepends = python-piff
 	optdepends = python2-piff
+	conflicts = python-piff
+	conflicts = python2-piff
 	source = python-piff-git::git+https://github.com/rmjarvis/Piff.git#tag=v0.2.5
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index df45e46fbc79..9d3c005bc6f8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,6 +18,7 @@ license=('BSD')
 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' )
+conflicts=('python-piff' 'python2-piff')
 source=("${pkgbase}::git+${url}#tag=v0.2.5")
 md5sums=('SKIP')
 
@@ -38,13 +39,13 @@ build() {
 	python2 setup.py build
 }
 
-check() {
-	cd "$srcdir"/$pkgbase
-	nosetests -v || warning 'Tests failed'
-
-	cd "$srcdir"/$pkgbase-py2
-	nosetests2 -v || warning 'Tests2 failed'
-}
+#check() {
+#	cd "$srcdir"/$pkgbase
+#	nosetests -v || warning 'Tests failed'
+#
+#	cd "$srcdir"/$pkgbase-py2
+#	nosetests2 -v || warning 'Tests2 failed'
+#}
 
 package_python-piff-git() {
 	  		  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')