This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 210d360  ARROW-9506: [Packaging][Python] Fix macOS wheel build failures
210d360 is described below

commit 210d3609f027ef9ed83911c2d1132cb9cbb2dc06
Author: Krisztián Szűcs <[email protected]>
AuthorDate: Thu Jul 16 21:24:05 2020 +0200

    ARROW-9506: [Packaging][Python] Fix macOS wheel build failures
    
    Closes #7785 from kszucs/osx-wheel-build-fixes
    
    Authored-by: Krisztián Szűcs <[email protected]>
    Signed-off-by: Krisztián Szűcs <[email protected]>
---
 dev/tasks/python-wheels/osx-build.sh   |  8 +++---
 dev/tasks/python-wheels/travis.osx.yml | 48 ++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/dev/tasks/python-wheels/osx-build.sh 
b/dev/tasks/python-wheels/osx-build.sh
index 677b04f..9129290 100755
--- a/dev/tasks/python-wheels/osx-build.sh
+++ b/dev/tasks/python-wheels/osx-build.sh
@@ -52,10 +52,6 @@ function build_wheel {
 
     pip install $(pip_opts) -r python/requirements-wheel-build.txt
 
-    export PYARROW_INSTALL_TESTS=1
-    export PYARROW_WITH_GANDIVA=0
-    export BUILD_ARROW_GANDIVA=OFF
-
     git submodule update --init
     export ARROW_TEST_DATA=`pwd`/testing/data
 
@@ -69,7 +65,7 @@ function build_wheel {
           -DARROW_DEPENDENCY_SOURCE=BUNDLED \
           -DARROW_HDFS=ON \
           -DARROW_FLIGHT=ON \
-          -DARROW_GANDIVA=${BUILD_ARROW_GANDIVA} \
+          -DARROW_GANDIVA=OFF \
           -DARROW_GRPC_USE_SHARED=OFF \
           -DARROW_JEMALLOC=ON \
           -DARROW_ORC=OFF \
@@ -114,8 +110,10 @@ function build_wheel {
     export PYARROW_WITH_ORC=0
     export PYARROW_WITH_JEMALLOC=1
     export PYARROW_WITH_PLASMA=1
+    export PYARROW_WITH_GANDIVA=0
     export PYARROW_BUNDLE_ARROW_CPP=1
     export PYARROW_BUILD_TYPE='release'
+    export PYARROW_INSTALL_TESTS=1
     export SETUPTOOLS_SCM_PRETEND_VERSION=$PYARROW_VERSION
     pushd python
     python setup.py build_ext bdist_wheel
diff --git a/dev/tasks/python-wheels/travis.osx.yml 
b/dev/tasks/python-wheels/travis.osx.yml
index 3aa552a..f2a62b9 100644
--- a/dev/tasks/python-wheels/travis.osx.yml
+++ b/dev/tasks/python-wheels/travis.osx.yml
@@ -18,6 +18,35 @@ os: osx
 osx_image: xcode11.3
 language: generic
 
+addons:
+  homebrew:
+    packages:
+      - automake
+      - boost
+      - brotli
+      - c-ares
+      - ccache
+      - cmake
+      - flatbuffers
+      - git
+      - glog
+      - grpc
+      - lz4
+      - ninja
+      - numpy
+      - [email protected]
+      - protobuf
+      - [email protected]
+      - rapidjson
+      - re2
+      - snappy
+      - thrift
+      - wget
+      - zstd
+      - bison
+      - flex
+    update: true
+
 # don't build twice
 if: tag IS blank
 
@@ -29,6 +58,7 @@ env:
     - PYARROW_BUILD_VERBOSE=1
     - MB_PYTHON_VERSION={{ python_version }}
     - MACOSX_DEPLOYMENT_TARGET="10.9"
+    - HOMEBREW_NO_AUTO_UPDATE=1
 
 before_install:
   - git clone https://github.com/matthew-brett/multibuild
@@ -37,22 +67,13 @@ before_install:
   - git clone --no-checkout {{ arrow.remote }} arrow
   - git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
   - git -C arrow checkout FETCH_HEAD
-
-  - brew update
-  - brew reinstall mercurial
-  - travis_wait 30 brew bundle --file=arrow/cpp/Brewfile
-  # Install tools to build bundled Thrift
-  - brew install
-      bison
-      flex
+  - git -C arrow submodule update --init
 
   # source utilities required for wheel builds
   - export CONFIG_PATH=`pwd`/arrow/dev/tasks/python-wheels/osx-build.sh
   - source multibuild/common_utils.sh
   - source multibuild/travis_osx_steps.sh
   - before_install
-  # Fix SSL TLS issue for Python 3.5 on macOS
-  - pip install requests[security]
 
 install:
   # the following functions are defined in osx-build.sh
@@ -64,7 +85,7 @@ install:
   # install the built wheel and test dependencies
   - install_wheel arrow
   # run unit tests before removing the system libraries
-  - run_unit_tests arrow
+  - ulimit -S -n 4096 && run_unit_tests arrow
   # run the import tests
   - run_import_tests
 
@@ -73,9 +94,8 @@ install:
   - deactivate
 
   # crossbow dependencies for deployment
-  - unset MACOSX_DEPLOYMENT_TARGET
-  - pip3 install click ruamel.yaml setuptools_scm github3.py toolz 
requests[security]
-  - python3 arrow/dev/tasks/crossbow.py
+  - /usr/local/opt/[email protected]/libexec/bin/pip install click ruamel.yaml 
setuptools_scm github3.py toolz requests[security]
+  - /usr/local/opt/[email protected]/libexec/bin/python arrow/dev/tasks/crossbow.py
       --queue-path $(pwd)
       --queue-remote {{ queue_remote_url }}
       upload-artifacts

Reply via email to