From 02871d68b8a0f28e3b49dfff98c8eacda1b8aece Mon Sep 17 00:00:00 2001 From: zshaheen Date: Mon, 27 Feb 2017 11:14:23 -0800 Subject: [PATCH 1/8] first try --- .travis.yml | 4 +--- conda-recipes/pcmdi_metrics/conda_upload.sh | 11 ++++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55556ea26..6165a8a1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +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; fi diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh index c249ce355..9048431f5 100644 --- a/conda-recipes/pcmdi_metrics/conda_upload.sh +++ b/conda-recipes/pcmdi_metrics/conda_upload.sh @@ -6,5 +6,14 @@ mkdir ~/conda-bld conda config --set anaconda_upload no export CONDA_BLD_PATH=~/conda-bld export VERSION=`date +%Y.%m.%d` + +git clone git://github.com/UV-CDAT/conda-recipes +cd conda-recipes + +python ./prep_for_build.py -v $VERSION +conda build . +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 conda build . -anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-0.tar.bz2 --force +anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-nox-$VERSION-py27_0.tar.bz2 --force From 6e7dd12bf50ebbc9b1ebd5f112e2e3b609e5a2e8 Mon Sep 17 00:00:00 2001 From: zshaheen Date: Mon, 27 Feb 2017 11:38:50 -0800 Subject: [PATCH 2/8] try 2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6165a8a1d..e31fffc7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,4 +26,4 @@ script: - python test/test_suite.py -V # --no-graphics after_success: - - 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 From 24c40a14e26a4194dc5688027188ed50541ee123 Mon Sep 17 00:00:00 2001 From: zshaheen Date: Mon, 27 Feb 2017 14:28:29 -0800 Subject: [PATCH 3/8] please work now --- conda-recipes/pcmdi_metrics/conda_upload.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh index 9048431f5..54b8cc6b8 100644 --- a/conda-recipes/pcmdi_metrics/conda_upload.sh +++ b/conda-recipes/pcmdi_metrics/conda_upload.sh @@ -7,13 +7,16 @@ conda config --set anaconda_upload no export CONDA_BLD_PATH=~/conda-bld export VERSION=`date +%Y.%m.%d` -git clone git://github.com/UV-CDAT/conda-recipes +mkdir temp +git clone git://github.com/UV-CDAT/conda-recipes temp +mkdir -p conda-recipes/pcmdi_metrics +cp build.sh meta.yaml.in conda-recipes/pcmdi_metrics cd conda-recipes python ./prep_for_build.py -v $VERSION -conda build . +conda build pcmdi_metrics 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 -conda build . +conda build pcmdi_metrics anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-nox-$VERSION-py27_0.tar.bz2 --force From 3b23ccbca856334704ffb9f6c6fa63d755dc1fca Mon Sep 17 00:00:00 2001 From: zshaheen Date: Mon, 27 Feb 2017 15:25:19 -0800 Subject: [PATCH 4/8] please work 2 --- conda-recipes/pcmdi_metrics/conda_upload.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh index 54b8cc6b8..93916d86c 100644 --- a/conda-recipes/pcmdi_metrics/conda_upload.sh +++ b/conda-recipes/pcmdi_metrics/conda_upload.sh @@ -9,9 +9,9 @@ export VERSION=`date +%Y.%m.%d` mkdir temp git clone git://github.com/UV-CDAT/conda-recipes temp -mkdir -p conda-recipes/pcmdi_metrics -cp build.sh meta.yaml.in conda-recipes/pcmdi_metrics -cd conda-recipes +mkdir -p temp/conda-recipes/pcmdi_metrics +cp conda-recipes/pcmdi_metrics/build.sh conda-recipes/pcmdi_metrics/meta.yaml.in temp/conda-recipes/pcmdi_metrics +cd temp/conda-recipes python ./prep_for_build.py -v $VERSION conda build pcmdi_metrics From 0192fcadf4286a0236bddd4c105cebc084e32c11 Mon Sep 17 00:00:00 2001 From: zshaheen Date: Mon, 27 Feb 2017 16:55:55 -0800 Subject: [PATCH 5/8] please work 3 --- conda-recipes/pcmdi_metrics/conda_upload.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh index 93916d86c..1814b0541 100644 --- a/conda-recipes/pcmdi_metrics/conda_upload.sh +++ b/conda-recipes/pcmdi_metrics/conda_upload.sh @@ -12,7 +12,8 @@ git clone git://github.com/UV-CDAT/conda-recipes temp mkdir -p temp/conda-recipes/pcmdi_metrics cp conda-recipes/pcmdi_metrics/build.sh conda-recipes/pcmdi_metrics/meta.yaml.in temp/conda-recipes/pcmdi_metrics cd temp/conda-recipes - +echo ls temp/conda-recipes +ls python ./prep_for_build.py -v $VERSION conda build pcmdi_metrics anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-$VERSION-0.tar.bz2 --force From 5d8db8c548a370cc4b1a31580dd16a5034008115 Mon Sep 17 00:00:00 2001 From: zshaheen Date: Tue, 28 Feb 2017 09:25:14 -0800 Subject: [PATCH 6/8] please work today --- conda-recipes/pcmdi_metrics/conda_upload.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh index 1814b0541..b5e73b1c8 100644 --- a/conda-recipes/pcmdi_metrics/conda_upload.sh +++ b/conda-recipes/pcmdi_metrics/conda_upload.sh @@ -7,12 +7,13 @@ conda config --set anaconda_upload no export CONDA_BLD_PATH=~/conda-bld export VERSION=`date +%Y.%m.%d` -mkdir temp -git clone git://github.com/UV-CDAT/conda-recipes temp -mkdir -p temp/conda-recipes/pcmdi_metrics +#mkdir temp +mkdir -p temp/conda-recipes +git clone git://github.com/UV-CDAT/conda-recipes temp/conda-recipes +mkdir temp/conda-recipes/pcmdi_metrics cp conda-recipes/pcmdi_metrics/build.sh conda-recipes/pcmdi_metrics/meta.yaml.in temp/conda-recipes/pcmdi_metrics cd temp/conda-recipes -echo ls temp/conda-recipes +echo ls temp/conda-recipes: ls python ./prep_for_build.py -v $VERSION conda build pcmdi_metrics From 475124ecd870514eacf8007d78912dd91774504b Mon Sep 17 00:00:00 2001 From: zshaheen Date: Tue, 28 Feb 2017 09:42:08 -0800 Subject: [PATCH 7/8] This will work, I promise. --- conda-recipes/pcmdi_metrics/conda_upload.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conda-recipes/pcmdi_metrics/conda_upload.sh b/conda-recipes/pcmdi_metrics/conda_upload.sh index b5e73b1c8..335ccdffc 100644 --- a/conda-recipes/pcmdi_metrics/conda_upload.sh +++ b/conda-recipes/pcmdi_metrics/conda_upload.sh @@ -13,12 +13,11 @@ git clone git://github.com/UV-CDAT/conda-recipes temp/conda-recipes mkdir temp/conda-recipes/pcmdi_metrics cp conda-recipes/pcmdi_metrics/build.sh conda-recipes/pcmdi_metrics/meta.yaml.in temp/conda-recipes/pcmdi_metrics cd temp/conda-recipes -echo ls temp/conda-recipes: -ls + python ./prep_for_build.py -v $VERSION conda build pcmdi_metrics 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 conda build pcmdi_metrics -anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-nox-$VERSION-py27_0.tar.bz2 --force +anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-nox-$VERSION-0.tar.bz2 --force From b2893881ef8ebf93508b12e2d0cef6dcd40f2698 Mon Sep 17 00:00:00 2001 From: zshaheen Date: Tue, 28 Feb 2017 17:21:51 -0800 Subject: [PATCH 8/8] revert .travis.yml to match master --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e31fffc7f..13c130e49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,4 +26,4 @@ script: - python test/test_suite.py -V # --no-graphics after_success: - - conda install conda-build && conda install anaconda-client && bash conda-recipes/pcmdi_metrics/conda_upload.sh + - 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