Skip to content

Commit a563ce3

Browse files
wesmkszucs
authored andcommitted
ARROW-6757: [Release] Use same CMake generator for C++ and Python when verifying RC, remove Python 3.5 from wheel verification
This resolves the issues I was having as described in ARROW-6757. This does not fix the Python 3.8 wheel, though Closes #6350 from wesm/windows-rc-verify-fixes and squashes the following commits: a9d4c66 <Wes McKinney> Fixes for Windows release verification scripts Authored-by: Wes McKinney <wesm+git@apache.org> Signed-off-by: Wes McKinney <wesm+git@apache.org>
1 parent 0945a02 commit a563ce3

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

dev/release/verify-release-candidate-wheels.bat

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,14 @@
2525
@echo on
2626

2727
set _CURRENT_DIR=%CD%
28-
set _VERIFICATION_DIR=C:\tmp\arrow-verify-release
28+
set _VERIFICATION_DIR=C:\tmp\arrow-verify-release-wheels
2929

3030
if not exist "C:\tmp\" mkdir C:\tmp
3131
if exist %_VERIFICATION_DIR% rd %_VERIFICATION_DIR% /s /q
3232
if not exist %_VERIFICATION_DIR% mkdir %_VERIFICATION_DIR%
3333

3434
cd %_VERIFICATION_DIR%
3535

36-
CALL :verify_wheel 3.5 %1 %2
37-
if errorlevel 1 GOTO error
38-
3936
CALL :verify_wheel 3.6 %1 %2
4037
if errorlevel 1 GOTO error
4138

@@ -62,7 +59,7 @@ set ARROW_VERSION=%2
6259
set RC_NUMBER=%3
6360
set PY_VERSION_NO_PERIOD=%PY_VERSION:.=%
6461

65-
set CONDA_ENV_PATH=C:\tmp\arrow-verify-release\_verify-wheel-%PY_VERSION%
62+
set CONDA_ENV_PATH=%_VERIFICATION_DIR%\_verify-wheel-%PY_VERSION%
6663
call conda create -p %CONDA_ENV_PATH% ^
6764
--no-shortcuts -f -q -y python=%PY_VERSION% ^
6865
|| EXIT /B 1

dev/release/verify-release-candidate.bat

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ pushd %ARROW_SOURCE%\cpp\build
7171
@rem This is the path for Visual Studio Community 2017
7272
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64
7373

74-
cmake -G "Ninja" ^
74+
@rem NOTE(wesm): not using Ninja for now to be able to more easily control the
75+
@rem generator used
76+
77+
cmake -G "%GENERATOR%" ^
7578
-DCMAKE_INSTALL_PREFIX=%ARROW_HOME% ^
7679
-DARROW_BUILD_STATIC=OFF ^
7780
-DARROW_BOOST_USE_SHARED=ON ^
@@ -90,11 +93,13 @@ cmake -G "Ninja" ^
9093
-DARROW_PARQUET=ON ^
9194
.. || exit /B
9295

96+
cmake --build . --target INSTALL --config Release
97+
9398
@rem NOTE(wesm): Building googletest is flaky for me with ninja. Building it
9499
@rem first fixes the problem
95-
ninja googletest_ep || exit /B
96100

97-
ninja install || exit /B
101+
@rem ninja googletest_ep || exit /B
102+
@rem ninja install || exit /B
98103

99104
@rem Get testing datasets for Parquet unit tests
100105
git clone https://github.com/apache/parquet-testing.git %_VERIFICATION_DIR%\parquet-testing
@@ -112,6 +117,7 @@ popd
112117
@rem Build and import pyarrow
113118
pushd %ARROW_SOURCE%\python
114119

120+
set PYARROW_CMAKE_GENERATOR=%GENERATOR%
115121
set PYARROW_WITH_FLIGHT=1
116122
set PYARROW_WITH_PARQUET=1
117123
python setup.py build_ext --inplace --bundle-arrow-cpp bdist_wheel || exit /B

0 commit comments

Comments
 (0)