Update packaging scripts

conda/anaconda_deploy.sh

@@ -4,13 +4,14 @@ export LBL=$1
 export TKN=$2
 export GIT_BRANCH=$3
 
-
 cd conda
-sed s/version_from_shell/`git describe --tags --dirty | sed -e 's/-\(.*\)-g.*/+\1/' -e 's/^[vr]//g' -e 's/rc-/rc./' -e 's/dirty/0/'`/ meta.yaml > meta.tmp.yaml
+sed s/version_from_shell/`git describe --tags --dirty | sed -e 's/-\(.*\)-g.*/+\1/' -e 's/^[vr]//g' -e 's/rc-/rc./' -e 's/-dirty//'`/ meta.yaml > meta.tmp.yaml
 mv meta.tmp.yaml meta.yaml
+echo "-----------------------"
+echo "GIT_BRANCH: $GIT_BRANCH"
+echo "-----------------------"
 cd ..
-conda install -c conda-forge conda-build --yes
-conda install anaconda-client --yes
+conda install conda-build anaconda-client --yes
 conda build conda --no-anaconda-upload
 TRG=`conda build conda --output |sed -e 's/--/-*-/'`
 echo "Uploading: $TRG"

conda/build.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+git checkout $GIT_BRANCH
+
 ./get_nanoversion.sh
 
 $PYTHON setup.py install

conda/meta.yaml

@@ -32,7 +32,6 @@ requirements:
     - pyyaml
     - h5py
     - setuptools
-    - setuptools_scm
 
   run:
     - python

get_nanoversion.sh

@@ -1,15 +1,17 @@
 #!/bin/bash
 
-br=`git branch |tail -n1`
+br=`git rev-parse HEAD`
+echo $br
 read o u f <<< `git remote -v |grep origin |grep fetch`
 echo "Repo: $o $u $br"
 git describe --tags --dirty
 TD=`mktemp -d`
 WD=`pwd`
+git branch
 git clone $u $TD
 cd $TD
-echo $u $br
 git checkout $br
+echo $u $br
 git describe --tags --dirty | sed -e 's/\([.0-9]*\)-\(.*\)-g.*/\2/' -e 's/^[vr]//g' -e 's/rc-//g' > $WD/__nanoversion__.txt
 cd $WD
 rm -rf "$TD"