From 6684a3d6a5b8a6d3a27665f23a5e4dbc3b0b1ed4 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 14 Mar 2018 11:32:00 -0700
Subject: [PATCH 1/3] bringing in nightlies from cdat

pushing to cdat channel
---
 .travis.yml                    | 4 ++--
 ci-support/circleci_mac_dep.sh | 4 ++--
 ci-support/conda_upload.sh     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5e3c289..d9d7b4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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 conda-forge genutil nose flake8 "numpy=1.13" 
 - export UVCDAT_ANONYMOUS_LOG=False
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
@@ -29,7 +29,7 @@ script:
 - 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" 
 - 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
index afc9cd2..29bfe04 100644
--- 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
index 7628de4..878bd04 100755
--- 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

From 3ba25b18877228e67afcd9fbc6ae31faa91ca902 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 14 Mar 2018 14:44:59 -0700
Subject: [PATCH 2/3] we need to make sure nessi channel is first or we get old
 esmpy version from conda-forge

---
 .travis.yml                          | 7 +++----
 tests/test_cdutil_VariableMatcher.py | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9d7b4d..3ed1e8b 100644
--- 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 cdat/label/nightly -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>=7.1"
 - 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 cdat/label/nightly -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>=7.1"
 - source activate py3
 - python setup.py install 
 - python run_tests.py -v2
diff --git a/tests/test_cdutil_VariableMatcher.py b/tests/test_cdutil_VariableMatcher.py
index 9a7094a..bb66f86 100644
--- 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()

From 009f628032efcddecdeb796a208c21b16407fd2c Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 14 Mar 2018 15:22:51 -0700
Subject: [PATCH 3/3] correct version should be automagic

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ed1e8b..d4702e9 100644
--- 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>=7.1"
+- 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,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>=7.1"
+- 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