ok... also trying to upload macs

PCMDI · Mar 2, 2018 · 2641d0c · 2641d0c
1 parent 59ac055
commit 2641d0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 os:
  - linux
-  # - osx
+ - osx
 language: python
  - "2.7"
 
@@ -21,8 +21,7 @@ script:
  - conda info -a
  - source activate py2
  - python setup.py install
- - source activate py2
- - python run_tests.py -v2
+ - "$TRAVIS_OS_NAME" = "linux" ]; then python run_tests.py -v2
 
 after_success:
- - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install "conda-build <=3.3.0" "anaconda-client <=1.6.6"  && bash -x recipes/pcmdi_metrics/conda_upload.sh; fi
+ - 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
diff --git a/recipes/pcmdi_metrics/conda_upload.sh b/recipes/pcmdi_metrics/conda_upload.sh
@@ -27,6 +27,7 @@ rm -rf cdp
 echo "cp -r ../../recipes/pcmdi_metrics ."
 cp -r ../../recipes/pcmdi_metrics .
 echo "Starting prep for build"
+source deactivate
 python ./prep_for_build.py -l 1.1.2
 echo "starting conda build"
 conda build pcmdi_metrics -c conda-forge -c uvcdat