From bacb8373d0bcd8203f20ed2392d2ad73ee1393cb Mon Sep 17 00:00:00 2001 From: Peter Killick Date: Mon, 22 Jan 2018 16:45:51 +0000 Subject: [PATCH 1/3] Define default channels --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f2a9ae8469..7de6d6b721 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ install: echo 'Configure conda and create an environment'; conda config --set always_yes yes --set changeps1 no; conda config --set show_channel_urls True; - conda config --add channels conda-forge; + conda config --add default_channels conda-forge; conda update --quiet conda; ENV_NAME='test-environment'; conda create --quiet -n $ENV_NAME python=$TRAVIS_PYTHON_VERSION pip; From 7db559de7fd8c49a1590fcaca44905905ebaf49a Mon Sep 17 00:00:00 2001 From: Peter Killick Date: Mon, 22 Jan 2018 17:10:18 +0000 Subject: [PATCH 2/3] Add another default --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7de6d6b721..8045807904 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,7 @@ install: conda config --set always_yes yes --set changeps1 no; conda config --set show_channel_urls True; conda config --add default_channels conda-forge; + conda config --add default_channels anaconda; conda update --quiet conda; ENV_NAME='test-environment'; conda create --quiet -n $ENV_NAME python=$TRAVIS_PYTHON_VERSION pip; From 7a4beae0a3ad174ead3d0514adeb2fb8e6795a2c Mon Sep 17 00:00:00 2001 From: Peter Killick Date: Tue, 23 Jan 2018 12:23:20 +0000 Subject: [PATCH 3/3] Swap new lines around --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8045807904..245b3aa997 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,8 +52,8 @@ install: echo 'Configure conda and create an environment'; conda config --set always_yes yes --set changeps1 no; conda config --set show_channel_urls True; - conda config --add default_channels conda-forge; conda config --add default_channels anaconda; + conda config --add default_channels conda-forge; conda update --quiet conda; ENV_NAME='test-environment'; conda create --quiet -n $ENV_NAME python=$TRAVIS_PYTHON_VERSION pip;