You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/09/20 22:19:09 UTC

[arrow] branch master updated: ARROW-3270: [Release] Adjust release verification scripts to recent parquet migration

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 e2c4b09  ARROW-3270: [Release] Adjust release verification scripts to recent parquet migration
e2c4b09 is described below

commit e2c4b09dc0c1369117ab7e7c20bf93bbfcc76b5d
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Thu Sep 20 18:18:54 2018 -0400

    ARROW-3270: [Release] Adjust release verification scripts to recent parquet migration
    
    Still unclear how to test it.
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    
    Closes #2591 from kszucs/ARROW-3270 and squashes the following commits:
    
    b8881df7c <Krisztián Szűcs>  remove standalone parquet-cpp builds
---
 dev/release/verify-release-candidate.bat | 15 +--------------
 dev/release/verify-release-candidate.sh  | 23 +----------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat
index 86abbc6..3b1bdab 100644
--- a/dev/release/verify-release-candidate.bat
+++ b/dev/release/verify-release-candidate.bat
@@ -59,7 +59,6 @@ set CONFIGURATION=release
 pushd %ARROW_SOURCE%
 
 set ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
-set PARQUET_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
 
 set ARROW_HOME=%INSTALL_DIR%
 set PARQUET_HOME=%INSTALL_DIR%
@@ -78,6 +77,7 @@ cmake -G "%GENERATOR%" ^
       -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
       -DARROW_CXXFLAGS="/MP" ^
       -DARROW_PYTHON=ON ^
+      -DARROW_PARQUET=ON ^
       ..  || exit /B
 cmake --build . --target INSTALL --config %CONFIGURATION%  || exit /B
 
@@ -87,19 +87,6 @@ set PYTHONPATH=%CONDA_PREFIX%\Lib;%CONDA_PREFIX%\Lib\site-packages;%CONDA_PREFIX
 ctest -VV  || exit /B
 popd
 
-@rem Build parquet-cpp
-git clone https://github.com/apache/parquet-cpp.git || exit /B
-mkdir %ARROW_SOURCE%\parquet-cpp\build
-pushd %ARROW_SOURCE%\parquet-cpp\build
-
-cmake -G "%GENERATOR%" ^
-     -DCMAKE_INSTALL_PREFIX=%PARQUET_HOME% ^
-     -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
-x     -DPARQUET_BOOST_USE_SHARED=OFF ^
-     -DPARQUET_BUILD_TESTS=off .. || exit /B
-cmake --build . --target INSTALL --config %CONFIGURATION% || exit /B
-popd
-
 @rem Build and import pyarrow
 @rem parquet-cpp has some additional runtime dependencies that we need to figure out
 @rem see PARQUET-1018
diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
index dc0f08f..7e5b167 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -158,6 +158,7 @@ test_and_install_cpp() {
 -DARROW_PLASMA=ON
 -DARROW_ORC=ON
 -DARROW_PYTHON=ON
+-DARROW_PARQUET=ON
 -DARROW_BOOST_USE_SHARED=ON
 -DCMAKE_BUILD_TYPE=release
 -DARROW_BUILD_BENCHMARKS=ON
@@ -174,27 +175,6 @@ test_and_install_cpp() {
   popd
 }
 
-# Build and install Parquet master so we can test the Python bindings
-
-install_parquet_cpp() {
-  git clone git@github.com:apache/parquet-cpp.git
-
-  mkdir parquet-cpp/build
-  pushd parquet-cpp/build
-
-  cmake -DCMAKE_INSTALL_PREFIX=$PARQUET_HOME \
-        -DCMAKE_INSTALL_LIBDIR=$PARQUET_HOME/lib \
-        -DCMAKE_BUILD_TYPE=release \
-        -DPARQUET_BOOST_USE_SHARED=on \
-        -DPARQUET_BUILD_TESTS=off \
-        ..
-
-  make -j$NPROC
-  make install
-
-  popd
-}
-
 # Build and test Python
 
 test_python() {
@@ -345,7 +325,6 @@ cd ${DIST_NAME}
 test_package_java
 setup_miniconda
 test_and_install_cpp
-install_parquet_cpp
 test_python
 test_glib
 test_ruby