From b4e0e93d580b8e0344c0caa1cf51cbe088bd25ac Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Jun 2016 13:28:10 -0700 Subject: [PATCH] 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 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 --- ci/travis_before_script_cpp.sh | 2 +- ci/travis_conda_build.sh | 2 +- ci/travis_install_conda.sh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh index 6159f67e3613b..9060cc9b5ef22 100755 --- 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 index c43a85170b094..a787df79a5574 100755 --- 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 index bef667dff7cc1..be7f59a4733bd 100644 --- 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