From 41b35c25f491035e99a0fb756a3a2cb4eea96dbd Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Thu, 15 Mar 2018 15:24:19 -0700 Subject: [PATCH 1/2] force py2 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4702e9..484208a 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 +- 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 From 76d15259b38f60bd5c36cbf366ef2321398cde4d Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Thu, 15 Mar 2018 15:26:16 -0700 Subject: [PATCH 2/2] force py2 for circleci as well --- ci-support/circleci_mac_dep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-support/circleci_mac_dep.sh b/ci-support/circleci_mac_dep.sh index 29bfe04..1ae7f55 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 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