Skip to content

Commit

Permalink
trying to downgrade conda-build so it does not crap out
Browse files Browse the repository at this point in the history
  • Loading branch information
doutriaux1 committed Mar 2, 2018
1 parent ffdebf8 commit 5b85c32
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ script:
- python run_tests.py -v2

after_success:
- if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install conda-build && conda install anaconda-client && bash -x recipes/pcmdi_metrics/conda_upload.sh; fi
- if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then conda install "conda-build<.4" && conda install anaconda-client && bash -x recipes/pcmdi_metrics/conda_upload.sh; fi
7 changes: 2 additions & 5 deletions recipes/pcmdi_metrics/conda_upload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ `uname` == "Linux" ]; then
OS=linux-64
echo "Linux OS"
export PATH="$HOME/miniconda2/bin:$PATH"
conda update -y -q conda
#conda update -y -q conda
else
echo "Mac OS"
OS=osx-64
Expand All @@ -20,19 +20,16 @@ conda config --set anaconda_upload no
export CONDA_BLD_PATH=`pwd`/build_conda
mkdir build_conda
echo "BUILDING IN:",$CONDA_BLD_PATH
export VERSION=`date +%Y.%m.%d`
echo "Cloning recipes"
git clone git:https://github.com/UV-CDAT/conda-recipes
cd conda-recipes
rm -rf cdp
# uvcdat creates issues for build -c uvcdat confises package and channel
#ln -s ../../recipes/pcmdi_metrics .
echo "cp -r ../../recipes/pcmdi_metrics ."
cp -r ../../recipes/pcmdi_metrics .
echo "Starting prep for build"
python ./prep_for_build.py -l 1.1.2
echo "starting conda build"
conda build pcmdi_metrics -c conda-forge -c uvcdat
echo "starting anaconda upload"
anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-*$VERSION*-0.tar.bz2 --force
anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-*tar.bz2 --force

0 comments on commit 5b85c32

Please sign in to comment.