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 2019/03/12 21:15:41 UTC

[arrow] branch master updated: ARROW-4724: [C++][CI] Enable Python build and test in MinGW build

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 b16b88b  ARROW-4724: [C++][CI] Enable Python build and test in MinGW build
b16b88b is described below

commit b16b88b8fbf477cadd63f5cf86c652e2d7c0be2a
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Tue Mar 12 16:15:34 2019 -0500

    ARROW-4724: [C++][CI] Enable Python build and test in MinGW build
    
    We don't need to set PYTHONHOME and PHTHONPATH when we use
    libpython.dll from MSYS2 through python.exe but we need to set them
    when we use libpython.dll directly.
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #3869 from kou/cpp-mingw-test-python and squashes the following commits:
    
    aee1d2906 <Kouhei Sutou>  Enable Python build and test in MinGW build
---
 ci/appveyor-cpp-build-mingw.bat | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat
index 54417b2..a7ea374 100644
--- a/ci/appveyor-cpp-build-mingw.bat
+++ b/ci/appveyor-cpp-build-mingw.bat
@@ -24,6 +24,10 @@ set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
 set PATH=%INSTALL_DIR%\bin;%PATH%
 set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig
 
+for /f "usebackq" %%v in (`python3 -c "import sys; print('.'.join(map(str, sys.version_info[0:2])))"`) do (
+  set PYTHON_VERSION=%%v
+)
+
 set CPP_BUILD_DIR=cpp\build
 mkdir %CPP_BUILD_DIR%
 pushd %CPP_BUILD_DIR%
@@ -45,14 +49,19 @@ cmake ^
     -DPythonInterp_FIND_VERSION=ON ^
     -DPythonInterp_FIND_VERSION_MAJOR=3 ^
     -DARROW_BUILD_TESTS=ON ^
-    -DARROW_PYTHON=OFF ^
     .. || exit /B
 make -j4 || exit /B
+setlocal
+set PYTHONHOME=%MINGW_PREFIX%\lib\python%PYTHON_VERSION%
+set PYTHONPATH=%PYTHONHOME%
+set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\lib-dynload
+set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\site-packages
 @rem TODO(ARROW-4784): Run all tests
 ctest ^
   --exclude-regex "arrow-array-test|arrow-thread-pool-test" ^
   --output-on-failure ^
   --parallel 2 || exit /B
+endlocal
 make install || exit /B
 popd