[
https://issues.apache.org/jira/browse/ARROW-2048?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16344742#comment-16344742
]
ASF GitHub Bot commented on ARROW-2048:
---------------------------------------
xhochy closed pull request #1528: ARROW-2048: [Python/C++] Upate Thrift pin to
0.11
URL: https://github.com/apache/arrow/pull/1528
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ci/msvc-build.bat b/ci/msvc-build.bat
index 94eb16a5e..9651772ca 100644
--- a/ci/msvc-build.bat
+++ b/ci/msvc-build.bat
@@ -81,7 +81,7 @@ conda info -a
conda create -n arrow -q -y python=%PYTHON% ^
six pytest setuptools numpy pandas cython ^
- thrift-cpp=0.10.0
+ thrift-cpp=0.11.0
if "%JOB%" == "Toolchain" (
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
index 2f164c416..7c1d726d4 100755
--- a/ci/travis_before_script_cpp.sh
+++ b/ci/travis_before_script_cpp.sh
@@ -47,7 +47,7 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
zlib \
cmake \
curl \
- thrift-cpp=0.10.0 \
+ thrift-cpp=0.11.0 \
ninja
# HACK(wesm): We started experiencing OpenSSL failures when Miniconda was
diff --git a/cpp/src/arrow/stl.h b/cpp/src/arrow/stl.h
index 3250b5a32..1e31ca769 100644
--- a/cpp/src/arrow/stl.h
+++ b/cpp/src/arrow/stl.h
@@ -18,6 +18,7 @@
#ifndef ARROW_STL_H
#define ARROW_STL_H
+#include <memory>
#include <string>
#include <tuple>
#include <vector>
diff --git a/python/manylinux1/Dockerfile-x86_64
b/python/manylinux1/Dockerfile-x86_64
index 919a32be7..9c00e7ea2 100644
--- a/python/manylinux1/Dockerfile-x86_64
+++ b/python/manylinux1/Dockerfile-x86_64
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:latest
+FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-2048
ADD arrow /arrow
WORKDIR /arrow/cpp
diff --git a/python/manylinux1/Dockerfile-x86_64_base
b/python/manylinux1/Dockerfile-x86_64_base
index 0160aa4ee..ec7893080 100644
--- a/python/manylinux1/Dockerfile-x86_64_base
+++ b/python/manylinux1/Dockerfile-x86_64_base
@@ -42,6 +42,9 @@ ADD scripts/build_flatbuffers.sh /
RUN /build_flatbuffers.sh
ENV FLATBUFFERS_HOME /usr
+ADD scripts/build_bison.sh /
+RUN /build_bison.sh
+
ADD scripts/build_thrift.sh /
RUN /build_thrift.sh
ENV THRIFT_HOME /usr
diff --git a/python/manylinux1/scripts/build_bison.sh
b/python/manylinux1/scripts/build_bison.sh
new file mode 100755
index 000000000..29cc0be6a
--- /dev/null
+++ b/python/manylinux1/scripts/build_bison.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -ex
+# 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.
+
+wget http://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.gz
+tar xf bison-3.0.4.tar.gz
+pushd bison-3.0.4
+./configure --prefix=/usr
+make -j4
+make install
+popd
+rm -rf bison-3.0.4 bison-3.0.4.tar.gz
diff --git a/python/manylinux1/scripts/build_thrift.sh
b/python/manylinux1/scripts/build_thrift.sh
index 28aa75b74..aaec4ad6b 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.10.0
+export THRIFT_VERSION=0.11.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}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [Python/C++] Upate Thrift pin to 0.11
> -------------------------------------
>
> Key: ARROW-2048
> URL: https://issues.apache.org/jira/browse/ARROW-2048
> Project: Apache Arrow
> Issue Type: Improvement
> Components: C++, Python
> Reporter: Uwe L. Korn
> Assignee: Uwe L. Korn
> Priority: Major
> Labels: pull-request-available
> Fix For: 0.9.0
>
>
> All the updates on the Parquet side are done, thus we need to unpin Thrift
> again to get a green master.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)