Merge branch 'master' into add_depth_coord_half

PCMDI · Mar 9, 2019 · dc50bb5 · dc50bb5
2 parents 3267026 + 8bf24db
commit dc50bb5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,7 +13,7 @@ aliases:
       git clone -b validateNightly [email protected]:CDAT/cdat workspace/cdat
       ls workspace/cdat
       # following will install miniconda3 under $WORKDIR/miniconda/bin
-      python workspace/cdat/scripts/install_miniconda.py -w $WORKDIR -p 'py3'
+      python workspace/cdat/scripts/install_miniconda.py -w $WORKDIR -p 'py2.7'
       
   - &create_conda_env
     name: create_conda_env
@@ -22,7 +22,7 @@ aliases:
        conda config --set always_yes yes --set changeps1 no
        conda update -y -q conda
        conda config --set anaconda_upload no
-       conda create -q -n py2 -c cdat/label/nightly -c pcmdi/label/nightly -c conda-forge -c cdat cmor python=2.7 testsrunner
+       conda create -q -n py2 -c cdat/label/nightly -c pcmdi/label/nightly -c conda-forge -c cdat lazy-object-proxy cmor python=2.7 testsrunner
 
   - &setup_cmor
     name: setup_cmor