hope...

PCMDI · Mar 2, 2018 · 91f5233 · 91f5233
1 parent ff45297
commit 91f5233
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,7 @@ script:
  - source activate py2
  - python setup.py install
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then python run_tests.py -v2 ; fi
+ - source deactivate
 
 after_success:
- - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install conda-build anaconda-client && bash -x recipes/pcmdi_metrics/conda_upload.sh; fi
+  - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install -n root conda-build anaconda-client && bash -x recipes/pcmdi_metrics/conda_upload.sh; fi
diff --git a/recipes/pcmdi_metrics/conda_upload.sh b/recipes/pcmdi_metrics/conda_upload.sh
@@ -28,6 +28,7 @@ echo "cp -r ../../recipes/pcmdi_metrics ."
 cp -r ../../recipes/pcmdi_metrics .
 echo "Starting prep for build"
 source deactivate
+source activate root
 python ./prep_for_build.py -l 1.1.2
 echo "starting conda build"
 conda build pcmdi_metrics -c conda-forge -c uvcdat