diff --git a/ci/docker/python-wheel-windows-vs2019.dockerfile b/ci/docker/python-wheel-windows-vs2019.dockerfile index 3fc979b9aeb25..ba9f59ffeaf62 100644 --- a/ci/docker/python-wheel-windows-vs2019.dockerfile +++ b/ci/docker/python-wheel-windows-vs2019.dockerfile @@ -38,11 +38,6 @@ RUN python -m pip install -r arrow/python/requirements-wheel-build.txt ENV PYTHON=${python} -# ENV CLCACHE_DIR="C:\clcache" -# ENV CLCACHE_COMPRESS=1 -# ENV CLCACHE_COMPRESSLEVEL=6 -# RUN pip install git+https://github.com/Nuitka/clcache.git - # For debugging purposes # RUN wget --no-check-certificate https://github.com/lucasg/Dependencies/releases/download/v1.10/Dependencies_x64_Release.zip # RUN unzip Dependencies_x64_Release.zip -d Dependencies && setx path "%path%;C:\Dependencies" diff --git a/ci/scripts/python_wheel_windows_build.bat b/ci/scripts/python_wheel_windows_build.bat index 05861a628718e..f0c54469559f2 100644 --- a/ci/scripts/python_wheel_windows_build.bat +++ b/ci/scripts/python_wheel_windows_build.bat @@ -19,9 +19,15 @@ echo "Building windows wheel..." +@REM List installed Pythons +py -0p + +set PYTHON_CMD=py -%PYTHON% +%PYTHON_CMD% -m sysconfig || exit /B 1 + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" -echo "=== (%PYTHON_VERSION%) Clear output directories and leftovers ===" +echo "=== (%PYTHON%) Clear output directories and leftovers ===" del /s /q C:\arrow-build del /s /q C:\arrow-dist del /s /q C:\arrow\python\dist @@ -29,7 +35,7 @@ del /s /q C:\arrow\python\build del /s /q C:\arrow\python\pyarrow\*.so del /s /q C:\arrow\python\pyarrow\*.so.* -echo "=== (%PYTHON_VERSION%) Building Arrow C++ libraries ===" +echo "=== (%PYTHON%) Building Arrow C++ libraries ===" set ARROW_ACERO=ON set ARROW_DATASET=ON set ARROW_FLIGHT=ON @@ -102,7 +108,7 @@ cmake ^ cmake --build . --config %CMAKE_BUILD_TYPE% --target install || exit /B 1 popd -echo "=== (%PYTHON_VERSION%) Building wheel ===" +echo "=== (%PYTHON%) Building wheel ===" set PYARROW_BUILD_TYPE=%CMAKE_BUILD_TYPE% set PYARROW_BUILD_VERBOSE=1 set PYARROW_BUNDLE_ARROW_CPP=ON @@ -124,5 +130,5 @@ set CMAKE_PREFIX_PATH=C:\arrow-dist pushd C:\arrow\python @REM bundle the msvc runtime cp "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29325\x64\Microsoft.VC142.CRT\msvcp140.dll" pyarrow\ -py -%PYTHON% setup.py bdist_wheel || exit /B 1 +%PYTHON_CMD% setup.py bdist_wheel || exit /B 1 popd diff --git a/dev/tasks/python-wheels/github.windows.yml b/dev/tasks/python-wheels/github.windows.yml index 37ee389c667fc..a4c196c85f46f 100644 --- a/dev/tasks/python-wheels/github.windows.yml +++ b/dev/tasks/python-wheels/github.windows.yml @@ -69,7 +69,7 @@ jobs: if errorlevel 1 ( archery docker build --no-pull %TEST_IMAGE_PREFIX%-wheel-windows-vs2019 || exit /B 1 ) - archery docker run --no-build -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }} python-wheel-windows-vs2019 + archery docker run --no-build -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }} %TEST_IMAGE_PREFIX%-wheel-windows-vs2019 - uses: actions/upload-artifact@v4 with: