From 3b39066c155cc2580f98fe501635497b80492166 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Tue, 15 Jan 2019 21:17:32 -0800 Subject: [PATCH] Fix pandas 0.22 incompatibility by upgrading Arrow (#3786) --- cmake/Modules/ArrowExternalProject.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/ArrowExternalProject.cmake b/cmake/Modules/ArrowExternalProject.cmake index e0cdd0756..9726d9324 100644 --- a/cmake/Modules/ArrowExternalProject.cmake +++ b/cmake/Modules/ArrowExternalProject.cmake @@ -15,17 +15,17 @@ # - PLASMA_SHARED_LIB set(arrow_URL https://github.com/ray-project/arrow.git) -# This commit is based on https://github.com/apache/arrow/pull/3392. We +# This commit is based on https://github.com/apache/arrow/pull/3410. We # include the link here to make it easier to find the right commit because # Arrow often rewrites git history and invalidates certain commits. # It has been patched to fix an upstream symbol clash with TensorFlow, # the patch is available at -# https://github.com/ray-project/arrow/commit/f8c990e4165012123e03d822c95526eaea5cbfab +# https://github.com/ray-project/arrow/commit/511dae1149e3656bbf84f461729f2306d2ebf2e5 # See the discussion in https://github.com/apache/arrow/pull/3177 # WARNING: If the arrow version is updated, you need to also update the # SETUPTOOLS_SCM_PRETEND_VERSION version string in the ThirdpartyToolchain.cmake # file -set(arrow_TAG f8c990e4165012123e03d822c95526eaea5cbfab) +set(arrow_TAG 511dae1149e3656bbf84f461729f2306d2ebf2e5) set(ARROW_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/arrow-install) set(ARROW_HOME ${ARROW_INSTALL_PREFIX})