Merge pull request #482 from PCMDI/nox_again

Fixed issue where nox was uploading non-nox code
PCMDI · Mar 14, 2017 · 029c87c · 029c87c
2 parents 3fd77dd + a90dfd1
commit 029c87c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
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