Merge pull request #19 from UV-CDAT/cdat_nightlies_pulled

Cdat nightlies pulled
CDAT · Mar 14, 2018 · a1c6466 · a1c6466
2 parents b07e569 + 4c3cf57
commit a1c6466
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
 - conda update -y -q conda
   #- conda install gcc
 script:
-- conda create -n py2 -c uvcdat/label/nightly -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8
+- conda create -n py2 -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8
 - export UVCDAT_ANONYMOUS_LOG=False
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
@@ -20,7 +20,7 @@ script:
 - python setup.py install 
 - python run_tests.py -v2
 - rm -rf build
-- conda create -n py3 -c nesii/channel/dev-esmf -c uvcdat/label/nightly -c conda-forge -c uvcdat cdms2 nose flake8 "python>3" udunits2 cdat_info
+- conda create -n py3 -c nesii/channel/dev-esmf -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c uvcdat cdms2 nose flake8 "python>3" udunits2 cdat_info
 - source activate py3
 - python setup.py install 
 - python run_tests.py -v2

diff --git a/ci-support/circleci_mac_dep.sh b/ci-support/circleci_mac_dep.sh
@@ -2,8 +2,8 @@
 ls
 pwd
 export PATH=${HOME}/miniconda/bin:${PATH}
-conda create -n py3 -c uvcdat/label/nightly -c nadeau1  -c conda-forge -c uvcdat cdms2 nose flake8 "python>3" cdat_info udunits2
-conda create -n py2 -c uvcdat/label/nightly -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8
+conda create -n py3 -c cdat/label/nightly -c uvcdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat cdms2 nose flake8 "python>3" cdat_info udunits2
+conda create -n py2 -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c uvcdat cdms2 cdat_info udunits2 nose flake8
 export UVCDAT_ANONYMOUS_LOG=False
 source activate py3
 python setup.py install

diff --git a/ci-support/conda_upload.sh b/ci-support/conda_upload.sh
@@ -26,5 +26,5 @@ cd conda-recipes
 rm -rf uvcdat
 python ./prep_for_build.py
 echo "Building and uploading now"
-conda build -c ${ESMF_CHANNEL} -c conda-forge -c uvcdat/label/nightly -c uvcdat ${PKG_NAME}
+conda build -c ${ESMF_CHANNEL} -c conda-forge -c cdat/label/nightly -c uvcdat/label/nightly -c uvcdat ${PKG_NAME}
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME*.tar.bz2 --force