From 6f9cda2f680ff071d6a6e3a5b3c5e0adb102b18f Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 24 Jan 2017 14:25:57 -0800
Subject: [PATCH 01/27] hoping to help travis not use /lib64

---
 setup.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 7790f1df..ac3fe30a 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@
     os.environ["CFLAGS"]="-w -g"
     pass
 
+libs_pth = os.path.join(sys.prefix,"lib")
 setup (name = "cdms2",
        version=Version,
        description = "Climate Data Management System",
@@ -76,11 +77,13 @@
                                 library_dirs = cdat_info.cdunif_library_directories,
                                 libraries = cdat_info.cdunif_libraries,
                                 define_macros = macros,
-                                extra_compile_args = [ ""],
+                                runtime_library_dirs = [libs_pth],
+                                extra_compile_args = [ "-L%s"% libs_pth],
                                 ),
                       Extension('cdms2._bindex',
                                 ['Src/_bindexmodule.c', 'Src/bindex.c'],
-                                extra_compile_args = [ ""],
+                                extra_compile_args = [ "-L%s"% libs_pth],
+                                runtime_library_dirs = [libs_pth],
                                 ) 
                      ]
       )
@@ -99,6 +102,12 @@
        packages = ['regrid2'],
        package_dir = {'regrid2': 'regrid2/Lib'},
        include_dirs = [numpy.lib.utils.get_include()],
-       ext_modules = [Extension('regrid2._regrid', ['regrid2/Src/_regridmodule.c']),
-                      Extension('regrid2._scrip', ['regrid2/Src/scrip.pyf','regrid2/Src/regrid.c'])]
+       ext_modules = [Extension('regrid2._regrid', ['regrid2/Src/_regridmodule.c'],
+                                runtime_library_dirs = [libs_pth],
+                                extra_compile_args = [ "-L%s"% libs_pth],
+                                ),
+                      Extension('regrid2._scrip', ['regrid2/Src/scrip.pyf','regrid2/Src/regrid.c'],
+                                runtime_library_dirs = [libs_pth],
+                                extra_compile_args = [ "-L%s"% libs_pth],
+                          )]
       )

From b77562d1b2c3b85d45c2c24f1ac5841a75ea9e82 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 24 Jan 2017 14:26:59 -0800
Subject: [PATCH 02/27] since issue is only linux turning off osx for now also
 uploading on all successes

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

diff --git a/.travis.yml b/.travis.yml
index 464da195..1ad3b7b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 os:
-    - osx
+    #    - osx
     - linux
 sudo: false
 before_install:
@@ -25,4 +25,5 @@ env:
   global:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=
 after_success:
-  - if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
+    #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
+  - if [ $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi

From c014999ae1dd2f74bad9287b707f8f746cd83064 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 24 Jan 2017 14:28:17 -0800
Subject: [PATCH 03/27] while testing turning off other numpys

---
 conda_upload.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/conda_upload.sh b/conda_upload.sh
index 7574a2d1..38e6a972 100644
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -13,10 +13,10 @@ export VERSION=`date +%Y.%m.%d`
 git clone git://github.com/UV-CDAT/conda-recipes
 cd conda-recipes
 python ./prep_for_build.py -v `date +%Y.%m.%d`
-conda build cdms2 -c conda-forge -c uvcdat --numpy=1.11
+conda build -c conda-forge -c uvcdat --numpy=1.11 cdms2
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np111py27_0.tar.bz2 --force
-conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10
-anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np110py27_0.tar.bz2 --force
-conda build cdms2 -c conda-forge -c uvcdat --numpy=1.9
-anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np19py27_0.tar.bz2 --force
+#conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10
+#anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np110py27_0.tar.bz2 --force
+#conda build cdms2 -c conda-forge -c uvcdat --numpy=1.9
+#anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np19py27_0.tar.bz2 --force
 

From c3fd47e99432670c335c3cc2387dadb299f9a676 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Tue, 24 Jan 2017 17:05:21 -0800
Subject: [PATCH 04/27] ok trying to run a docker now

---
 .travis.yml     | 9 +++++++--
 conda_upload.sh | 8 +++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ad3b7b9..267185f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,10 @@
 os:
     #    - osx
     - linux
-sudo: false
+sudo: required
+services:
+    - docker
+
 before_install:
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
@@ -26,4 +29,6 @@ env:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
-  - if [ $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
+    - docker pull centos:centos6
+    - docker cp conda_upload.sh centos:centos6:conda_upload.sh
+    - if [ $TRAVIS_PULL_REQUEST == "false" ]; then docker run -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c "conda_upload.sh" ; fi
diff --git a/conda_upload.sh b/conda_upload.sh
index 38e6a972..3217cd3f 100644
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -1,7 +1,13 @@
 PKG_NAME=cdms2
 USER=uvcdat
-if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+if [ `uname` == "Linux" ]; then
     OS=linux-64
+    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+    export PATH="$HOME/miniconda/bin:$PATH"
+    bash miniconda.sh -b -p $HOME/miniconda
+    conda config --set always_yes yes --set changeps1 no
+    conda update -y -q conda
+    conda install gcc conda-build anaconda-client
 else
     OS=osx-64
 fi

From 0707d87c2dde1417fe114e2e21cafd63279011d9 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 09:53:04 -0800
Subject: [PATCH 05/27] another try at docker

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 267185f8..83a72246 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,5 +30,4 @@ env:
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
     - docker pull centos:centos6
-    - docker cp conda_upload.sh centos:centos6:conda_upload.sh
-    - if [ $TRAVIS_PULL_REQUEST == "false" ]; then docker run -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c "conda_upload.sh" ; fi
+    - if [ $TRAVIS_PULL_REQUEST == "false" ]; then docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c "travis_home/conda_upload.sh" ; fi

From 52c5f193d1931385199a15112929ecf8ff32279e Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 11:30:30 -0800
Subject: [PATCH 06/27] no if test while testing

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 83a72246..6587b640 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,4 +30,4 @@ env:
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
     - docker pull centos:centos6
-    - if [ $TRAVIS_PULL_REQUEST == "false" ]; then docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c "travis_home/conda_upload.sh" ; fi
+    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c "travis_home/conda_upload.sh" 

From 86253816693db988e79b7e63ecfdc524c29271e8 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 11:59:57 -0800
Subject: [PATCH 07/27] make sure conda_upload is executable, added bash header
 to it, full path for docker

---
 .travis.yml     | 2 +-
 conda_upload.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 conda_upload.sh

diff --git a/.travis.yml b/.travis.yml
index 6587b640..136c1593 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,4 +30,4 @@ env:
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
     - docker pull centos:centos6
-    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c "travis_home/conda_upload.sh" 
+    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c /travis_home/conda_upload.sh 
diff --git a/conda_upload.sh b/conda_upload.sh
old mode 100644
new mode 100755
index 3217cd3f..bc73763f
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 PKG_NAME=cdms2
 USER=uvcdat
 if [ `uname` == "Linux" ]; then

From 533b6711744ac6186e48ec2456919f305bf83b66 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 14:18:44 -0800
Subject: [PATCH 08/27] -c is not needed

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 136c1593..ccb0240a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,4 +30,5 @@ env:
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
     - docker pull centos:centos6
-    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d -p 127.0.0.1:80:4567 centos:centos6 -c /travis_home/conda_upload.sh 
+    - pwd
+    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d centos:centos6 /travis_home/conda_upload.sh 

From 152c6175483104fe67e1056778e66fe4eafcfe50 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 16:50:20 -0800
Subject: [PATCH 09/27] installing missing packages on centos6

---
 conda_upload.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/conda_upload.sh b/conda_upload.sh
index bc73763f..e3a025be 100755
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -1,15 +1,22 @@
 #!/usr/bin/env bash
 PKG_NAME=cdms2
 USER=uvcdat
+echo "Trying to upload conda"
 if [ `uname` == "Linux" ]; then
     OS=linux-64
-    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+    echo "Linux OS"
+    yum install -y wget git redhat-lsb-core
+    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh --no-check-certificate
+    echo "WGET RETRUNED:"$?
     export PATH="$HOME/miniconda/bin:$PATH"
     bash miniconda.sh -b -p $HOME/miniconda
     conda config --set always_yes yes --set changeps1 no
+    conda config --set ssl_verify false
     conda update -y -q conda
     conda install gcc conda-build anaconda-client
+    binstar config --set verify_ssl False
 else
+    echo "Mac OS"
     OS=osx-64
 fi
 
@@ -17,10 +24,13 @@ mkdir ~/conda-bld
 conda config --set anaconda_upload no
 export CONDA_BLD_PATH=~/conda-bld
 export VERSION=`date +%Y.%m.%d`
+echo "Cloning recipes"
 git clone git://github.com/UV-CDAT/conda-recipes
 cd conda-recipes
 python ./prep_for_build.py -v `date +%Y.%m.%d`
+echo "Building now"
 conda build -c conda-forge -c uvcdat --numpy=1.11 cdms2
+echo "Uploading"
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np111py27_0.tar.bz2 --force
 #conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10
 #anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np110py27_0.tar.bz2 --force

From d1e7690dff8306df8beadcf8f035a86ee9a141d0 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 16:56:42 -0800
Subject: [PATCH 10/27] more verbose docker

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ccb0240a..6ee5da7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,4 @@ env:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
-    - docker pull centos:centos6
-    - pwd
-    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN -d centos:centos6 /travis_home/conda_upload.sh 
+    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT centos:centos6 /travis_home/conda_upload.sh 

From cb43ef2225cc0ccc559bae219ad56cd34b8c7518 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 17:28:52 -0800
Subject: [PATCH 11/27] gfortra needed

---
 conda_upload.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda_upload.sh b/conda_upload.sh
index e3a025be..271e9117 100755
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -5,7 +5,7 @@ echo "Trying to upload conda"
 if [ `uname` == "Linux" ]; then
     OS=linux-64
     echo "Linux OS"
-    yum install -y wget git redhat-lsb-core
+    yum install -y wget git redhat-lsb-core gcc-gfortran
     wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh --no-check-certificate
     echo "WGET RETRUNED:"$?
     export PATH="$HOME/miniconda/bin:$PATH"
@@ -13,7 +13,7 @@ if [ `uname` == "Linux" ]; then
     conda config --set always_yes yes --set changeps1 no
     conda config --set ssl_verify false
     conda update -y -q conda
-    conda install gcc conda-build anaconda-client
+    conda install gcc conda-build anaconda-client libgcc libgfortran
     binstar config --set verify_ssl False
 else
     echo "Mac OS"

From 01cda8e4eb433223cb5348e43a99471ccf611f17 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 17:42:18 -0800
Subject: [PATCH 12/27] quiet because output seems too long

---
 conda_upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda_upload.sh b/conda_upload.sh
index 271e9117..c0b3c5eb 100755
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -29,7 +29,7 @@ git clone git://github.com/UV-CDAT/conda-recipes
 cd conda-recipes
 python ./prep_for_build.py -v `date +%Y.%m.%d`
 echo "Building now"
-conda build -c conda-forge -c uvcdat --numpy=1.11 cdms2
+conda build -q -c conda-forge -c uvcdat --numpy=1.11 cdms2
 echo "Uploading"
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np111py27_0.tar.bz2 --force
 #conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10

From 59c425a1033d33b9ee105948c525928d59cdcf8b Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Wed, 25 Jan 2017 18:28:46 -0800
Subject: [PATCH 13/27] need to print env to see what is really passed

---
 conda_upload.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conda_upload.sh b/conda_upload.sh
index c0b3c5eb..d80beae1 100755
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -29,7 +29,8 @@ git clone git://github.com/UV-CDAT/conda-recipes
 cd conda-recipes
 python ./prep_for_build.py -v `date +%Y.%m.%d`
 echo "Building now"
-conda build -q -c conda-forge -c uvcdat --numpy=1.11 cdms2
+echo "ENV"`env`
+conda build -c conda-forge -c uvcdat --numpy=1.11 cdms2
 echo "Uploading"
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np111py27_0.tar.bz2 --force
 #conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10

From a62014741e46d425b370f30ea6f10a42553acb34 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 11:44:18 -0800
Subject: [PATCH 14/27] trying to use our custom docker image with everything
 pre-loaded

---
 .travis.yml     |  2 +-
 conda_upload.sh | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ee5da7b..01a234e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,4 +29,4 @@ env:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
-    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT centos:centos6 /travis_home/conda_upload.sh 
+    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT cdat/conda /travis_home/conda_upload.sh 
diff --git a/conda_upload.sh b/conda_upload.sh
index d80beae1..8acf3b9a 100755
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -5,16 +5,8 @@ echo "Trying to upload conda"
 if [ `uname` == "Linux" ]; then
     OS=linux-64
     echo "Linux OS"
-    yum install -y wget git redhat-lsb-core gcc-gfortran
-    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh --no-check-certificate
-    echo "WGET RETRUNED:"$?
-    export PATH="$HOME/miniconda/bin:$PATH"
-    bash miniconda.sh -b -p $HOME/miniconda
-    conda config --set always_yes yes --set changeps1 no
-    conda config --set ssl_verify false
+    export PATH="$HOME/miniconda2/bin:$PATH"
     conda update -y -q conda
-    conda install gcc conda-build anaconda-client libgcc libgfortran
-    binstar config --set verify_ssl False
 else
     echo "Mac OS"
     OS=osx-64
@@ -22,7 +14,7 @@ fi
 
 mkdir ~/conda-bld
 conda config --set anaconda_upload no
-export CONDA_BLD_PATH=~/conda-bld
+export CONDA_BLD_PATH=${HOME}/conda-bld
 export VERSION=`date +%Y.%m.%d`
 echo "Cloning recipes"
 git clone git://github.com/UV-CDAT/conda-recipes

From feac6c32ad52647ffeefc05bf9a44390da2f0709 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 12:15:44 -0800
Subject: [PATCH 15/27] seems like networks hangs so putting a retry

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 01a234e2..58d47d3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ script:
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then conda install -c conda-forge -c uvcdat uvcdat-nox pyopenssl; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then conda install -c conda-forge -c uvcdat uvcdat pyopenssl; fi
 - export UVCDAT_ANONYMOUS_LOG=False
-- vcs_download_sample_data
+- travis_retry vcs_download_sample_data
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
 - echo $TRAVIS_EVENT_TYPE

From 18f8f07c4c0f55f086cd07487511ad5b37ef48b6 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 13:18:16 -0800
Subject: [PATCH 16/27] for the purpose of testing docker turing off actuall
 travis bits

---
 .travis.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58d47d3c..c34e6ebf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,24 +6,24 @@ services:
     - docker
 
 before_install:
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
+- #if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
 - export PATH="$HOME/miniconda/bin:$PATH"
-- bash miniconda.sh -b -p $HOME/miniconda
-- conda config --set always_yes yes --set changeps1 no
-- conda update -y -q conda
-- conda install gcc
+- #bash miniconda.sh -b -p $HOME/miniconda
+- #conda config --set always_yes yes --set changeps1 no
+- #conda update -y -q conda
+- #conda install gcc
 script:
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then conda install -c conda-forge -c uvcdat uvcdat-nox pyopenssl; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then conda install -c conda-forge -c uvcdat uvcdat pyopenssl; fi
+- #if [ "$TRAVIS_OS_NAME" = "linux" ]; then conda install -c conda-forge -c uvcdat uvcdat-nox pyopenssl; fi
+- #if [ "$TRAVIS_OS_NAME" = "osx" ]; then conda install -c conda-forge -c uvcdat uvcdat pyopenssl; fi
 - export UVCDAT_ANONYMOUS_LOG=False
-- travis_retry vcs_download_sample_data
+- #travis_retry vcs_download_sample_data
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
 - echo $TRAVIS_EVENT_TYPE
 - echo $TRAVIS_PULL_REQUEST
-- python setup.py install
-- python run_tests.py
+- #python setup.py install
+- #python run_tests.py
 env:
   global:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=

From deef08f378ebbf5027fea805ba2d0a583efb4377 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 14:56:49 -0800
Subject: [PATCH 17/27] get latest docker image with conda-forge pkg
 pre-downloaded

build numpy 1.11, 1.10 , 1.9
---
 .travis.yml     |  2 +-
 conda_upload.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c34e6ebf..1ce4a1c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,4 +29,4 @@ env:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=
 after_success:
     #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
-    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT cdat/conda /travis_home/conda_upload.sh 
+    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT cdat/conda:conda-forge-cdms2 /travis_home/conda_upload.sh 
diff --git a/conda_upload.sh b/conda_upload.sh
index 8acf3b9a..93f035ae 100755
--- a/conda_upload.sh
+++ b/conda_upload.sh
@@ -19,14 +19,15 @@ export VERSION=`date +%Y.%m.%d`
 echo "Cloning recipes"
 git clone git://github.com/UV-CDAT/conda-recipes
 cd conda-recipes
+# uvcdat creates issues for build -c uvcdat confises package and channel
+rm -rf uvcdat
 python ./prep_for_build.py -v `date +%Y.%m.%d`
 echo "Building now"
-echo "ENV"`env`
 conda build -c conda-forge -c uvcdat --numpy=1.11 cdms2
 echo "Uploading"
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np111py27_0.tar.bz2 --force
-#conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10
-#anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np110py27_0.tar.bz2 --force
-#conda build cdms2 -c conda-forge -c uvcdat --numpy=1.9
-#anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np19py27_0.tar.bz2 --force
+conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10
+anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np110py27_0.tar.bz2 --force
+conda build cdms2 -c conda-forge -c uvcdat --numpy=1.9
+anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np19py27_0.tar.bz2 --force
 

From 3aed5cf04a4377d4ef4d4c982e11b81f7e07622b Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 15:27:50 -0800
Subject: [PATCH 18/27] trying to matrix oses

---
 .travis.yml | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ce4a1c3..e6a3668c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,41 @@
-os:
-    #    - osx
-    - linux
-sudo: required
+matrix:
+    include:
+        - os: linux
+            #dist: trusty
+            sudo: required
+            services:
+                - docker
+        - os: osx
+
+#os:
+#    - osx
+#    - linux
+#sudo: required
 services:
     - docker
 
 before_install:
-- #if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh; fi
 - export PATH="$HOME/miniconda/bin:$PATH"
-- #bash miniconda.sh -b -p $HOME/miniconda
-- #conda config --set always_yes yes --set changeps1 no
-- #conda update -y -q conda
-- #conda install gcc
+- bash miniconda.sh -b -p $HOME/miniconda
+- conda config --set always_yes yes --set changeps1 no
+- conda update -y -q conda
+- conda install gcc
 script:
-- #if [ "$TRAVIS_OS_NAME" = "linux" ]; then conda install -c conda-forge -c uvcdat uvcdat-nox pyopenssl; fi
-- #if [ "$TRAVIS_OS_NAME" = "osx" ]; then conda install -c conda-forge -c uvcdat uvcdat pyopenssl; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then conda install -c conda-forge -c uvcdat uvcdat-nox pyopenssl; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then conda install -c conda-forge -c uvcdat uvcdat pyopenssl; fi
 - export UVCDAT_ANONYMOUS_LOG=False
-- #travis_retry vcs_download_sample_data
+- travis_retry vcs_download_sample_data
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
 - echo $TRAVIS_EVENT_TYPE
 - echo $TRAVIS_PULL_REQUEST
-- #python setup.py install
-- #python run_tests.py
+- python setup.py install
+- python run_tests.py
 env:
   global:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=
 after_success:
-    #- if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" ]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
-    - docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT cdat/conda:conda-forge-cdms2 /travis_home/conda_upload.sh 
+    - if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" -a "$TRAVIS_OS_NAME" = "osx"]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
+    - if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" -a "$TRAVIS_OS_NAME" = "linux"]; docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT cdat/conda:conda-forge-cdms2 /travis_home/conda_upload.sh ; fi

From 39d4f378f737e97406b1a74c7c04f279f99b2ccf Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 15:37:39 -0800
Subject: [PATCH 19/27] need to put os before matrix?

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

diff --git a/.travis.yml b/.travis.yml
index e6a3668c..553ef1ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,7 @@
+os:
+    - osx
+    - linux
+
 matrix:
     include:
         - os: linux
@@ -7,9 +11,6 @@ matrix:
                 - docker
         - os: osx
 
-#os:
-#    - osx
-#    - linux
 #sudo: required
 services:
     - docker

From 5dc848047fff98574e8cf85da8b3a9adbe7f6522 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 15:48:54 -0800
Subject: [PATCH 20/27] dropping matrix can't figure it out

---
 .travis.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 553ef1ed..0a039e94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,16 +2,7 @@ os:
     - osx
     - linux
 
-matrix:
-    include:
-        - os: linux
-            #dist: trusty
-            sudo: required
-            services:
-                - docker
-        - os: osx
-
-#sudo: required
+sudo: required
 services:
     - docker
 

From 86e671ae55df087982cec93958159a20c130ba52 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 16:32:37 -0800
Subject: [PATCH 21/27] trying to add circle ci

---
 .travis.yml |  2 +-
 circle.sh   | 25 +++++++++++++++++++++++++
 circle.yml  | 24 ++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100755 circle.sh
 create mode 100644 circle.yml

diff --git a/.travis.yml b/.travis.yml
index 0a039e94..b26c104e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 os:
-    - osx
+#    - osx
     - linux
 
 sudo: required
diff --git a/circle.sh b/circle.sh
new file mode 100755
index 00000000..020d0461
--- /dev/null
+++ b/circle.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+PKG_NAME=cdms2
+USER=uvcdat
+echo "Trying to upload conda"
+conda update -y -q conda
+mkdir ${HOME}/conda-bld
+conda config --set anaconda_upload no
+export CONDA_BLD_PATH=${HOME}/conda-bld
+export VERSION=`date +%Y.%m.%d`
+echo "Cloning recipes"
+ls -l 
+#git clone git://github.com/UV-CDAT/conda-recipes
+#cd conda-recipes
+# uvcdat creates issues for build -c uvcdat confises package and channel
+#rm -rf uvcdat
+#python ./prep_for_build.py -v `date +%Y.%m.%d`
+#echo "Building now"
+#conda build -c conda-forge -c uvcdat --numpy=1.11 cdms2
+#echo "Uploading"
+#anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np111py27_0.tar.bz2 --force
+#conda build cdms2 -c conda-forge -c uvcdat --numpy=1.10
+#anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np110py27_0.tar.bz2 --force
+#conda build cdms2 -c conda-forge -c uvcdat --numpy=1.9
+#anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-`date +%Y.%m.%d`-np19py27_0.tar.bz2 --force
+
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..f4b21539
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,24 @@
+general:
+  branches:
+    ignore:
+      # We only want to build pull requests for testing. If something is merged,
+      # then we are prepping for release an there is no need to build it again.
+      - master
+
+checkout:
+  post:
+    - ./scripts/checkout_merge_commit.sh
+
+machine:
+  services:
+    - docker
+
+dependencies:
+  # Note, we used to use the naive caching of docker images, but found that it was quicker
+  # just to pull each time. #rollondockercaching
+  override:
+    - docker pull cdat/conda:conda-forge-cdms2
+
+test:
+  override:
+    - docker run -it -v `pwd`:/git_home -e CONDA_UPLOAD_TOKEN="uv-5e6dfdce-271a-4144-8e00-a40766606fc3" -a STDOUT -a STDERR -P cdat/conda /git_home/circle.sh

From c933d489c5f9db174875cbbbed6fdedf8229b907 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 16:34:59 -0800
Subject: [PATCH 22/27] needs a checkout, copied from conda-forge

---
 scripts/checkout_merge_commit.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100755 scripts/checkout_merge_commit.sh

diff --git a/scripts/checkout_merge_commit.sh b/scripts/checkout_merge_commit.sh
new file mode 100755
index 00000000..0d82d172
--- /dev/null
+++ b/scripts/checkout_merge_commit.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+
+# Add `master` branch to the update list.
+# Otherwise CircleCI will give us a cached one.
+FETCH_REFS="+master:master"
+
+# Update PR refs for testing.
+if [[ -n "${CIRCLE_PR_NUMBER}" ]]
+then
+    FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/head:pr/${CIRCLE_PR_NUMBER}/head"
+    FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge"
+fi
+
+# Retrieve the refs.
+git fetch -u origin ${FETCH_REFS}
+
+# Checkout the PR merge ref.
+if [[ -n "${CIRCLE_PR_NUMBER}" ]]
+then
+    git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge"
+fi
+
+# Check for merge conflicts.
+if [[ -n "${CIRCLE_PR_NUMBER}" ]]
+then
+    git branch --merged | grep master > /dev/null
+    git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null
+fi

From 6c93846e18213a07ff4c9ffa24bdc450767611e6 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 16:42:20 -0800
Subject: [PATCH 23/27] reorg a bit

---
 .travis.yml                                | 4 ++--
 circle.yml                                 | 2 +-
 circle.sh => scripts/circle.sh             | 3 ++-
 conda_upload.sh => scripts/conda_upload.sh | 0
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename circle.sh => scripts/circle.sh (98%)
 rename conda_upload.sh => scripts/conda_upload.sh (100%)

diff --git a/.travis.yml b/.travis.yml
index b26c104e..fc9c199f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,5 +29,5 @@ env:
   global:
     secure: Z06idl4BP01QMhrocmfuYV4CcbLmb5ZJZoXXymDr5sLIIfqdMiSL/CfDCRkIwl44vKpTN5R9AAhQV6iNMdU0NOQQrftHJyT5YV4y966FuAA1v9ev7y/cgExJFv7M/4E37WAN6YIcO7E42KZReeNKOAodorpqoT87MW6FAImZbrM=
 after_success:
-    - if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" -a "$TRAVIS_OS_NAME" = "osx"]; then conda install conda-build && conda install anaconda-client && bash conda_upload.sh ; fi
-    - if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" -a "$TRAVIS_OS_NAME" = "linux"]; docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT cdat/conda:conda-forge-cdms2 /travis_home/conda_upload.sh ; fi
+    - if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" -a "$TRAVIS_OS_NAME" = "osx"]; then conda install conda-build && conda install anaconda-client && bash scripts/conda_upload.sh ; fi
+    - if [ $TRAVIS_BRANCH == "master" -a $TRAVIS_PULL_REQUEST == "false" -a "$TRAVIS_OS_NAME" = "linux"]; docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -a STDOUT cdat/conda:conda-forge-cdms2 /travis_home/scripts/conda_upload.sh ; fi
diff --git a/circle.yml b/circle.yml
index f4b21539..1486b503 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,4 +21,4 @@ dependencies:
 
 test:
   override:
-    - docker run -it -v `pwd`:/git_home -e CONDA_UPLOAD_TOKEN="uv-5e6dfdce-271a-4144-8e00-a40766606fc3" -a STDOUT -a STDERR -P cdat/conda /git_home/circle.sh
+    - docker run -it -v `pwd`:/git_repo -e CONDA_UPLOAD_TOKEN="uv-5e6dfdce-271a-4144-8e00-a40766606fc3" -a STDOUT -a STDERR -P cdat/conda:conda-forge-cdms2 /git_repo/scripts/circle.sh
diff --git a/circle.sh b/scripts/circle.sh
similarity index 98%
rename from circle.sh
rename to scripts/circle.sh
index 020d0461..6504f200 100755
--- a/circle.sh
+++ b/scripts/circle.sh
@@ -8,7 +8,8 @@ conda config --set anaconda_upload no
 export CONDA_BLD_PATH=${HOME}/conda-bld
 export VERSION=`date +%Y.%m.%d`
 echo "Cloning recipes"
-ls -l 
+cd /git_repo
+ls -l
 #git clone git://github.com/UV-CDAT/conda-recipes
 #cd conda-recipes
 # uvcdat creates issues for build -c uvcdat confises package and channel
diff --git a/conda_upload.sh b/scripts/conda_upload.sh
similarity index 100%
rename from conda_upload.sh
rename to scripts/conda_upload.sh

From 9275b121f3944e8fa779d658ab2f72df433c19f8 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 16:49:20 -0800
Subject: [PATCH 24/27] ok actually running this thing now on circle-ci

---
 scripts/circle.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/circle.sh b/scripts/circle.sh
index 6504f200..f8eedcbb 100755
--- a/scripts/circle.sh
+++ b/scripts/circle.sh
@@ -1,15 +1,20 @@
 #!/usr/bin/env bash
 PKG_NAME=cdms2
 USER=uvcdat
+export PATH=${HOME}/miniconda2/bin:${PATH}
 echo "Trying to upload conda"
 conda update -y -q conda
-mkdir ${HOME}/conda-bld
+conda install -c conda-forge -c uvcdat uvcdat-nox pyopenssl
+vcs_download_sample_data
+#mkdir ${HOME}/conda-bld
 conda config --set anaconda_upload no
-export CONDA_BLD_PATH=${HOME}/conda-bld
-export VERSION=`date +%Y.%m.%d`
+#export CONDA_BLD_PATH=${HOME}/conda-bld
+#export VERSION=`date +%Y.%m.%d`
 echo "Cloning recipes"
 cd /git_repo
 ls -l
+python setup.py install
+python run_tests.py
 #git clone git://github.com/UV-CDAT/conda-recipes
 #cd conda-recipes
 # uvcdat creates issues for build -c uvcdat confises package and channel

From 0da0c78da9059981f62490e49e91da60b8bfb2a8 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 16:58:28 -0800
Subject: [PATCH 25/27] anonymous CDAT

---
 scripts/circle.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/circle.sh b/scripts/circle.sh
index f8eedcbb..b4143607 100755
--- a/scripts/circle.sh
+++ b/scripts/circle.sh
@@ -10,6 +10,7 @@ vcs_download_sample_data
 conda config --set anaconda_upload no
 #export CONDA_BLD_PATH=${HOME}/conda-bld
 #export VERSION=`date +%Y.%m.%d`
+export UVCDAT_ANONYMOUS_LOG=False
 echo "Cloning recipes"
 cd /git_repo
 ls -l

From 159c6cd4529a73d66eae937273ef68f8af9f95e2 Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 18:06:49 -0800
Subject: [PATCH 26/27] token removed it was in clear, wrong location for env
 variable

---
 circle.yml        | 2 +-
 scripts/circle.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 1486b503..fb409c88 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,4 +21,4 @@ dependencies:
 
 test:
   override:
-    - docker run -it -v `pwd`:/git_repo -e CONDA_UPLOAD_TOKEN="uv-5e6dfdce-271a-4144-8e00-a40766606fc3" -a STDOUT -a STDERR -P cdat/conda:conda-forge-cdms2 /git_repo/scripts/circle.sh
+      - docker run -it -v `pwd`:/git_repo -a STDOUT -a STDERR -P cdat/conda:conda-forge-cdms2 /git_repo/scripts/circle.sh
diff --git a/scripts/circle.sh b/scripts/circle.sh
index b4143607..cdad6296 100755
--- a/scripts/circle.sh
+++ b/scripts/circle.sh
@@ -5,12 +5,12 @@ export PATH=${HOME}/miniconda2/bin:${PATH}
 echo "Trying to upload conda"
 conda update -y -q conda
 conda install -c conda-forge -c uvcdat uvcdat-nox pyopenssl
+export UVCDAT_ANONYMOUS_LOG=False
 vcs_download_sample_data
 #mkdir ${HOME}/conda-bld
 conda config --set anaconda_upload no
 #export CONDA_BLD_PATH=${HOME}/conda-bld
 #export VERSION=`date +%Y.%m.%d`
-export UVCDAT_ANONYMOUS_LOG=False
 echo "Cloning recipes"
 cd /git_repo
 ls -l

From bc158eae2cdab6f15f999281dc6bddc3c293b6af Mon Sep 17 00:00:00 2001
From: Charles Doutriaux <doutriaux1@llnl.gov>
Date: Thu, 9 Feb 2017 18:14:56 -0800
Subject: [PATCH 27/27] putting mac back in for travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fc9c199f..36c640ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 os:
-#    - osx
+    - osx
     - linux
 
 sudo: required