Repository: arrow Updated Branches: refs/heads/master ee78cdcb1 -> 4cb3e97e9
ARROW-1662: Move to using Homebrew/bundle and Brewfile improves osx dependency management Author: Stephen G <[email protected]> Author: Stephen <[email protected]> Author: Stephen Groat <[email protected]> Closes #1143 from stephengroat/osx-brew and squashes the following commits: 81d4ac15 [Stephen G] Merge branch 'osx-brew' of https://github.com/stephengroat/arrow into osx-brew 62a79291 [Stephen G] Add license headers cee779b1 [Stephen] increase to max travis_wait 583ec0a7 [Stephen G] Move to individual brewfiles 65148557 [Stephen] add travis wait to get around timeouts 6faef0ce [Stephen Groat] Move to using Homebrew/bundle and Brewfile Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/4cb3e97e Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/4cb3e97e Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/4cb3e97e Branch: refs/heads/master Commit: 4cb3e97e9ad137313eadc18345e28e4e7642ed40 Parents: ee78cdc Author: Stephen G <[email protected]> Authored: Tue Oct 10 23:47:29 2017 -0400 Committer: Wes McKinney <[email protected]> Committed: Tue Oct 10 23:47:29 2017 -0400 ---------------------------------------------------------------------- .travis.yml | 2 +- c_glib/Brewfile | 25 +++++++++++++++++++++++++ ci/travis_before_script_c_glib.sh | 6 +----- ci/travis_before_script_cpp.sh | 4 +--- cpp/Brewfile | 21 +++++++++++++++++++++ cpp/README.md | 2 +- python/Brewfile | 21 +++++++++++++++++++++ python/doc/source/development.rst | 2 +- python/testing/setup_toolchain.sh | 4 +--- 9 files changed, 73 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 4691eeb..e722c27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ matrix: before_script: - export ARROW_TRAVIS_USE_TOOLCHAIN=1 - export ARROW_TRAVIS_PLASMA=1 - - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh + - travis_wait 50 $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh script: - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh - $TRAVIS_BUILD_DIR/ci/travis_build_parquet_cpp.sh http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/c_glib/Brewfile ---------------------------------------------------------------------- diff --git a/c_glib/Brewfile b/c_glib/Brewfile new file mode 100644 index 0000000..80d3c81 --- /dev/null +++ b/c_glib/Brewfile @@ -0,0 +1,25 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +brew "gtk-doc" +brew "autoconf-archive" +brew "gobject-introspection" +brew "git" +brew "cmake" +brew "wget" +brew "libtool" +brew "lua" http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/ci/travis_before_script_c_glib.sh ---------------------------------------------------------------------- diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh index 7100946..14e4f9f 100755 --- a/ci/travis_before_script_c_glib.sh +++ b/ci/travis_before_script_c_glib.sh @@ -22,10 +22,7 @@ set -ex source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh if [ $TRAVIS_OS_NAME == "osx" ]; then - brew install gtk-doc autoconf-archive gobject-introspection - brew upgrade git cmake - brew outdated || brew upgrade wget - brew outdated || brew upgrade libtool + brew update && brew bundle --file=c_glib/Brewfile export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig fi @@ -33,7 +30,6 @@ fi gem install test-unit gobject-introspection if [ $TRAVIS_OS_NAME == "osx" ]; then - brew install lua sudo env PKG_CONFIG_PATH=$PKG_CONFIG_PATH luarocks install lgi else git clone \ http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/ci/travis_before_script_cpp.sh ---------------------------------------------------------------------- diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh index 5dd8237..dbdcd33 100755 --- a/ci/travis_before_script_cpp.sh +++ b/ci/travis_before_script_cpp.sh @@ -54,9 +54,7 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then fi if [ $TRAVIS_OS_NAME == "osx" ]; then - brew update > /dev/null - brew install jemalloc - brew install ccache + brew update && brew bundle --file=cpp/Brewfile fi mkdir $ARROW_CPP_BUILD_DIR http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/cpp/Brewfile ---------------------------------------------------------------------- diff --git a/cpp/Brewfile b/cpp/Brewfile new file mode 100644 index 0000000..5f82cac --- /dev/null +++ b/cpp/Brewfile @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +brew "jemalloc" +brew "ccache" +brew "boost" +brew "cmake" http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/cpp/README.md ---------------------------------------------------------------------- diff --git a/cpp/README.md b/cpp/README.md index a94699b..9c26842 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -42,7 +42,7 @@ sudo apt-get install cmake \ On OS X, you can use [Homebrew][1]: ```shell -brew install boost cmake +brew update && brew bundle --file=cpp/Brewfile ``` If you are developing on Windows, see the [Windows developer guide][2]. http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/python/Brewfile ---------------------------------------------------------------------- diff --git a/python/Brewfile b/python/Brewfile new file mode 100644 index 0000000..dae4544 --- /dev/null +++ b/python/Brewfile @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +brew "ccache" +brew "jemalloc" +brew "boost" +brew "thrift" http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/python/doc/source/development.rst ---------------------------------------------------------------------- diff --git a/python/doc/source/development.rst b/python/doc/source/development.rst index 2d71323..093c6c0 100644 --- a/python/doc/source/development.rst +++ b/python/doc/source/development.rst @@ -108,7 +108,7 @@ building Arrow C++: .. code-block:: shell - brew install ccache jemalloc boost thrift + brew update && brew bundle --file=python/Brewfile On Debian/Ubuntu, you need the following minimal set of dependencies. All other dependencies will be automatically built by Arrow' thrid-party toolchain. http://git-wip-us.apache.org/repos/asf/arrow/blob/4cb3e97e/python/testing/setup_toolchain.sh ---------------------------------------------------------------------- diff --git a/python/testing/setup_toolchain.sh b/python/testing/setup_toolchain.sh index c3837b4..fa5df55 100644 --- a/python/testing/setup_toolchain.sh +++ b/python/testing/setup_toolchain.sh @@ -59,7 +59,5 @@ conda create -y -q -p $CPP_TOOLCHAIN python=3.6 \ ninja if [ $BUILD_OS_NAME == "osx" ]; then - brew update > /dev/null - brew install jemalloc - brew install ccache + brew update && brew bundle --file=python/Brewfile fi
