You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2017/05/06 10:57:18 UTC
arrow git commit: ARROW-953: Use conda-forge cmake,
curl in CI toolchain
Repository: arrow
Updated Branches:
refs/heads/master 995317ae9 -> 8febd03f8
ARROW-953: Use conda-forge cmake, curl in CI toolchain
Author: Wes McKinney <we...@twosigma.com>
Closes #645 from wesm/ARROW-953 and squashes the following commits:
4f719c1 [Wes McKinney] Use conda-forge cmake, curl in CI toolchain
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/8febd03f
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/8febd03f
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/8febd03f
Branch: refs/heads/master
Commit: 8febd03f862eab0ca83871e9ff8c5062550b646d
Parents: 995317a
Author: Wes McKinney <we...@twosigma.com>
Authored: Sat May 6 12:57:14 2017 +0200
Committer: Uwe L. Korn <uw...@xhochy.com>
Committed: Sat May 6 12:57:14 2017 +0200
----------------------------------------------------------------------
.travis.yml | 2 --
ci/travis_install_conda.sh | 4 ++--
ci/travis_script_python.sh | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/8febd03f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 19e71ae..d821b5a 100644
--- 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
http://git-wip-us.apache.org/repos/asf/arrow/blob/8febd03f/ci/travis_install_conda.sh
----------------------------------------------------------------------
diff --git a/ci/travis_install_conda.sh b/ci/travis_install_conda.sh
index 7d185ee..369820b 100644
--- 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
http://git-wip-us.apache.org/repos/asf/arrow/blob/8febd03f/ci/travis_script_python.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index c1426da..20b0f2a 100755
--- 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