ARROW-953: Use conda-forge cmake, curl in CI toolchain

Author: Wes McKinney <[email protected]> Closes apache#645 from wesm/ARROW-953 and squashes the following commits: 4f719c1 [Wes McKinney] Use conda-forge cmake, curl in CI toolchain
milevin · May 6, 2017 · c30a898 · c30a898
1 parent 996a02f
commit c30a898
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,11 @@ addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
-    - kalakris-cmake
     packages:
     - gcc-4.9   # Needed for C++11
     - g++-4.9   # Needed for C++11
     - gdb
     - ccache
-    - cmake
     - valgrind
     - libboost-dev
     - libboost-filesystem-dev

diff --git a/ci/travis_install_conda.sh b/ci/travis_install_conda.sh
@@ -40,7 +40,7 @@ conda config --add channels https://repo.continuum.io/pkgs/free
 conda config --add channels conda-forge
 conda info -a
 
-conda install --yes conda-build jinja2 anaconda-client
-
 # faster builds, please
 conda install -y nomkl
+
+conda install --y conda-build jinja2 anaconda-client cmake curl
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
@@ -23,7 +23,7 @@ export PARQUET_HOME=$TRAVIS_BUILD_DIR/parquet-env
 
 build_parquet_cpp() {
   export PARQUET_ARROW_VERSION=$(git rev-parse HEAD)
-  conda create -y -q -p $PARQUET_HOME python=3.6
+  conda create -y -q -p $PARQUET_HOME python=3.6 cmake curl
   source activate $PARQUET_HOME
 
   # In case some package wants to download the MKL
@@ -89,7 +89,7 @@ python_version_tests() {
   export ARROW_HOME=$TRAVIS_BUILD_DIR/arrow-install-$PYTHON_VERSION
   export LD_LIBRARY_PATH=$ARROW_HOME/lib:$PARQUET_HOME/lib
 
-  conda create -y -q -p $CONDA_ENV_DIR python=$PYTHON_VERSION
+  conda create -y -q -p $CONDA_ENV_DIR python=$PYTHON_VERSION cmake curl
   source activate $CONDA_ENV_DIR
 
   python --version