Use tarball package srfit-sasview 3.1.2.

Author: pavoljuhas

Diff for: diffpy-cmi/install

@@ -322,10 +322,8 @@ do_clean() {
         cd $SRCDIR/diffpy.srfit &&
             rm -rf build temp diffpy.srreal.egg-info
     ) || return $?
-    ListSkipOrDo clean "src/srfit-sasview" || {
-        setopt xtrace
-        cd $SRCDIR/srfit-sasview &&
-            rm -rf build temp srfit_sasview.egg-info
+    ListSkipOrDo clean "src/srfit-sasview (N/A)" || {
+        print $MSG_NOCLEAN
     } || return $?
 }
 
@@ -425,7 +423,7 @@ do_build() {
     } || return $?
     ListSkipOrDo build "srfit-sasview" || {
         python_easy_install -ZN --prefix=$BASEDIR --exclude-scripts \
-            ${SRCDIR}/srfit-sasview
+            ${SRCDIR}/srfit-sasview/srfit-sasview-*.tar.gz(om[1])
     } || return $?
 }
 

Diff for: diffpy-cmi/makedist

@@ -63,9 +63,6 @@ gitrepos=(
     diffpy.srfit
         https://github.com/diffpy/diffpy.srfit.git
         master:v1.1
-    srfit-sasview
-        https://github.com/pavoljuhas/sasview.git
-        srfit-sasview:f5f721d1b1c4afcb4e4fbd9a1e13beff75c05881
 )
 
 # Mercurial repositories for the sources in order of
@@ -81,6 +78,8 @@ tarballs=(
         https://pypi.python.org/packages/source/P/PyCifRW/PyCifRW-4.1.1.tar.gz
     periodictable
         https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz
+    srfit-sasview
+        https://github.com/diffpy/srfit-sasview/releases/download/sfsv3.1.2/srfit-sasview-3.1.2.tar.gz
 )
 
 # Subversion repositories as (targetpath, URL)
@@ -349,8 +348,8 @@ ListSkipOrBuild diffpy.srreal binary || {
 }
 
 ListSkipOrBuild srfit-sasview binary || {
-    python_easy_install -N --prefix=$PREFIX --exclude-scripts \
-        ${SRCDIR}/srfit-sasview
+    python_easy_install -ZN --prefix=$PREFIX --exclude-scripts \
+        ${SRCDIR}/srfit-sasview/srfit-sasview-*.tar.gz(om[1])
 }
 
 ListSkipOrBuild diffpy.srfit binary || {