ARROW-217: Fix Travis w.r.t conda 4.1.0 changes

Travis is happy, fixes the problems we see with Travis in #85 Author: Uwe L. Korn <uwelk@xhochy.com> Closes #90 from xhochy/fix-conda-show-channel-urls and squashes the following commits: 82e9840 [Uwe L. Korn] ARROW-217: Fix Travis w.r.t. conda 4.1.0 changes
apache · Jun 15, 2016 · b4e0e93 · b4e0e93
1 parent ec66ddd
commit b4e0e93
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
 conda install -y --channel apache/channel/dev parquet-cpp

diff --git a/ci/travis_conda_build.sh b/ci/travis_conda_build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
 

diff --git a/ci/travis_install_conda.sh b/ci/travis_install_conda.sh
@@ -15,9 +15,11 @@ export PATH="$MINICONDA/bin:$PATH"
 conda update -y -q conda
 conda info -a
 
-conda config --set show_channel_urls yes
+conda config --set show_channel_urls True
+conda config --add channels https://repo.continuum.io/pkgs/free
 conda config --add channels conda-forge
 conda config --add channels apache
+conda info -a
 
 conda install --yes conda-build jinja2 anaconda-client