Merge pull request #24 from UV-CDAT/cdat_nightlies_pulled

bringing in nightlies from cdat
CDAT · Mar 14, 2018 · 1c4ea5f · 1c4ea5f
2 parents 77d37fb + 009f628
commit 1c4ea5f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ python:
 sudo: false
 
 before_install:
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-Linux-x86_64.sh -O miniconda.sh; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
 - export PATH="$HOME/miniconda/bin:$PATH"
 - bash miniconda.sh -b -p $HOME/miniconda
@@ -18,7 +18,7 @@ before_install:
   #- conda install gcc
 script:
 # =======
-- conda create -n py2 -c uvcdat/label/nightly -c conda-forge genutil nose flake8 "numpy=1.13" 
+- 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
 - export UVCDAT_ANONYMOUS_LOG=False
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
@@ -28,8 +28,7 @@ script:
 - python setup.py install 
 - python run_tests.py -v2
 - rm -rf build
-# netcdf-fortran 4.4.4=6 (3 is no longer avail)
-- conda create -n py3 -c uvcdat/label/nightly -c conda-forge -c nesii/channel/dev-esmf genutil nose flake8 "python>3" "numpy=1.13" 
+- 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
 - 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 uvcdat/label/nightly -c conda-forge genutil nose flake8 "python>3" "numpy=1.13" 
-conda create -n py2 -c nesii/label/dev-esmf -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 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" 
 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
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 PKG_NAME=cdutil
-USER=uvcdat
+USER=cdat
 VERSION="2.12"
 export PATH="$HOME/miniconda/bin:$PATH"
 echo "Trying to upload conda"
@@ -26,6 +26,6 @@ cd conda-recipes
 rm -rf uvcdat
 python ./prep_for_build.py
 echo "Building and uploading now"
-conda build  -c uvcdat/label/nightly -c conda-forge -c ${ESMF_CHANNEL} -c uvcdat ${PKG_NAME} --python=2.7
-conda build  -c uvcdat/label/nightly -c conda-forge -c ${ESMF_CHANNEL} -c uvcdat ${PKG_NAME} --python=3.6
+conda build  -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c ${ESMF_CHANNEL} -c uvcdat ${PKG_NAME} --python=2.7
+conda build  -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c ${ESMF_CHANNEL} -c uvcdat ${PKG_NAME} --python=3.6
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-${VERSION}.$(date +%Y.%m.%d)*_0.tar.bz2 --force
diff --git a/tests/test_cdutil_VariableMatcher.py b/tests/test_cdutil_VariableMatcher.py
@@ -78,6 +78,7 @@ def testVariableMatcher2(self):
         FG.latitude.first=-85.
         FG.latitude.delta=10.
         # Now creates the compare object
+        print("REF:",Ref())
         c=cdutil.VariablesMatcher(Ref, Tst, weightedGridMaker=FG, externalVariableConditioner=EV)
         # And gets it
         (ref, reffrc), (test, tfrc) = c()