This is an automated email from the ASF dual-hosted git repository.
wesm 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 b77b662 ARROW-4778: [C++/Python] manylinux1: Update Thrift to 0.12.0
b77b662 is described below
commit b77b6625a8c1cbb14912269f10d7a2901342d764
Author: Uwe L. Korn <uw...@xhochy.com>
AuthorDate: Wed Mar 6 10:41:13 2019 -0600
ARROW-4778: [C++/Python] manylinux1: Update Thrift to 0.12.0
Author: Uwe L. Korn <uw...@xhochy.com>
Author: Uwe L. Korn <xh...@users.noreply.github.com>
Closes #3823 from xhochy/ARROW-4778 and squashes the following commits:
20a0e144 <Uwe L. Korn> Update .travis.yml
ae167f75 <Uwe L. Korn> ARROW-4778: manylinux1: Update Thrift to 0.12.0
---
.travis.yml | 3 ++-
ci/travis_script_manylinux.sh | 2 +-
python/manylinux1/scripts/build_thrift.sh | 19 ++++++++++---------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 60676b5..ddf6fcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -226,8 +226,9 @@ matrix:
language: cpp
env:
- PYTHON_VERSIONS="2.7,32 3.6,16"
+ - MANYLINUX1_IMAGE="quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-4778"
before_script:
- - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then docker pull quay.io/xhochy/arrow_manylinux1_x86_64_base:llvm-7-manylinux1; fi
+ - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then docker pull $MANYLINUX1_IMAGE; fi
script:
- if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_manylinux.sh; fi
- name: "Java w/ OpenJDK 8"
diff --git a/ci/travis_script_manylinux.sh b/ci/travis_script_manylinux.sh
index 9606e54..9f05f26 100755
--- a/ci/travis_script_manylinux.sh
+++ b/ci/travis_script_manylinux.sh
@@ -53,7 +53,7 @@ for PYTHON_TUPLE in ${PYTHON_VERSIONS}; do
-e UNICODE_WIDTH=$UNICODE_WIDTH \
-v $PWD:/io \
-v $PWD/../../:/arrow \
- quay.io/pravindra/arrow_manylinux1_x86_64_base:latest \
+ $MANYLINUX1_IMAGE \
/io/build_arrow.sh
# create a testing conda environment
diff --git a/python/manylinux1/scripts/build_thrift.sh b/python/manylinux1/scripts/build_thrift.sh
index 451025c..dca4ad4 100755
--- a/python/manylinux1/scripts/build_thrift.sh
+++ b/python/manylinux1/scripts/build_thrift.sh
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
-export THRIFT_VERSION=0.11.0
+export THRIFT_VERSION=0.12.0
wget http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz
tar xf thrift-${THRIFT_VERSION}.tar.gz
pushd thrift-${THRIFT_VERSION}
@@ -27,14 +27,15 @@ cmake -DCMAKE_BUILD_TYPE=release \
"-DCMAKE_C_FLAGS=-fPIC" \
"-DCMAKE_INSTALL_PREFIX=/usr" \
"-DCMAKE_INSTALL_RPATH=/usr/lib" \
- "-DBUILD_SHARED_LIBS=OFF" \
- "-DBUILD_TESTING=OFF" \
- "-DWITH_QT4=OFF" \
- "-DWITH_C_GLIB=OFF" \
- "-DWITH_JAVA=OFF" \
- "-DWITH_PYTHON=OFF" \
- "-DWITH_CPP=ON" \
- "-DWITH_STATIC_LIB=ON" \
+ -DBUILD_EXAMPLES=OFF \
+ -DBUILD_TESTING=OFF \
+ -DWITH_QT4=OFF \
+ -DWITH_C_GLIB=OFF \
+ -DWITH_JAVA=OFF \
+ -DWITH_PYTHON=OFF \
+ -DWITH_CPP=ON \
+ -DWITH_STATIC_LIB=ON \
+ -DWITH_SHARED_LIB=OFF \
-DBoost_NAMESPACE=arrow_boost \
-DBOOST_ROOT=/arrow_boost_dist \
-GNinja ..