Merge pull request #25 from CDAT/cdat_nightlies_pulled

Cdat nightlies pulled
CDAT · Mar 21, 2018 · 76cfe6b · 76cfe6b
2 parents 1c4ea5f + 76d1525
commit 76cfe6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ before_install:
   #- conda install gcc
 script:
 # =======
-- conda create -n py2 -c cdat/label/nightly -c uvcdat/label/nightly -c nesii/label/dev-esmf -c conda-forge genutil nose flake8 "numpy=1.13" esmpy
+- conda create -n py2 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge genutil nose flake8 "numpy=1.13" esmpy "python<3"
 - export UVCDAT_ANONYMOUS_LOG=False
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
@@ -28,7 +28,7 @@ script:
 - python setup.py install 
 - python run_tests.py -v2
 - rm -rf build
-- conda create -n py3 -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c nesii/channel/dev-esmf genutil nose flake8 "python>3" "numpy=1.13" esmpy
+- conda create -n py3 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge genutil nose flake8 "numpy=1.13" esmpy "python>3"
 - 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 nesii/label/dev-esmf -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge genutil nose flake8 "python>3" "numpy=1.13" 
-conda create -n py2 -c nesii/label/dev-esmf -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge genutil nose flake8 "numpy=1.13" 
+conda create -n py3 -c nesii/label/dev-esmf -c cdat/label/nightly -c conda-forge genutil nose flake8 "numpy=1.13" "python>3"
+conda create -n py2 -c nesii/label/dev-esmf -c cdat/label/nightly -c conda-forge genutil nose flake8 "numpy=1.13" "python<3"
 export UVCDAT_ANONYMOUS_LOG=False
 source activate py3
 python setup.py install