Fixed issue where nox was uploading non-nox code

PCMDI · Mar 14, 2017 · b8c5427 · b8c5427
1 parent 3fd77dd
commit b8c5427
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,4 +26,4 @@ script:
  - python test/test_suite.py -V # --no-graphics
 
 after_success:
- - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda-recipes/pcmdi_metrics/conda_upload.sh; fi
+ - conda install conda-build && conda install anaconda-client && bash conda-recipes/pcmdi_metrics/conda_upload.sh
diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh
@@ -15,9 +15,12 @@ cp conda-recipes/pcmdi_metrics/build.sh conda-recipes/pcmdi_metrics/meta.yaml.in
 cd temp/conda-recipes
 
 python ./prep_for_build.py -v $VERSION
+cp pcmdi_metrics/meta.yml.in pcmdi_metrics/meta.yml
 conda build pcmdi_metrics
+rm pcmdi_metrics/meta.yml
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-$VERSION-0.tar.bz2 --force
 
 python ./prep_for_build.py -v $VERSION -f nox
+cp pcmdi_metrics/meta.yml.in pcmdi_metrics/meta.yml
 conda build pcmdi_metrics
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-nox-$VERSION-0.tar.bz2 --force
diff --git a/conda-recipes/pcmdi_metrics/meta.yaml b/conda-recipes/pcmdi_metrics/meta.yaml