Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-10-13
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-10-13
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-01-22
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-01-22

# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
# See https://github.com/conan-io/conan-docker-tools#readme and
Expand Down
9 changes: 5 additions & 4 deletions ci/docker/python-wheel-windows-vs2022-base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,15 @@ RUN `
# See https://docs.python.org/dev/using/windows.html#python-install-manager and
# https://www.python.org/ftp/python/pymanager/
RUN `
$pymanager_url = 'https://www.python.org/ftp/python/pymanager/python-manager-25.0.msix'; `
Invoke-WebRequest -Uri $pymanager_url -OutFile 'C:\Windows\pymanager.msix'; `
Add-AppxPackage C:\Windows\pymanager.msix
$pymanager_url = 'https://www.python.org/ftp/python/pymanager/python-manager-25.0.msi'; `
Invoke-WebRequest -Uri $pymanager_url -OutFile 'C:\Windows\pymanager.msi'; `
Start-Process msiexec.exe -Wait -ArgumentList '/i C:\Windows\pymanager.msi /quiet /norestart'; `
Remove-Item C:\Windows\pymanager.msi

SHELL ["cmd", "/S", "/C"]

# Install CMake and other tools
ARG cmake=3.31.2
ARG cmake=3.31.9
RUN choco install --no-progress -r -y cmake --version=%cmake% --installargs 'ADD_CMAKE_TO_PATH=System'
RUN choco install --no-progress -r -y git gzip ninja wget

Expand Down
10 changes: 6 additions & 4 deletions ci/docker/python-wheel-windows-vs2022.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ FROM ${base}
# Define the full version number otherwise choco falls back to patch number 0 (3.10 => 3.10.0)
ARG python=3.10

ARG python_variant=default
ENV PYTHON_VERSION=${python}
ENV PYTHON_VARIANT=${python_variant}
RUN pymanager install --version %PYTHON_VERSION% --variant %PYTHON_VARIANT%
ARG python_variant_suffix=""
ENV PYTHON_VERSION=${python}${python_variant_suffix}

RUN pymanager install %PYTHON_VERSION%

RUN py -%PYTHON_VERSION% -m pip install -U pip setuptools

COPY python/requirements-wheel-build.txt C:/arrow/python/
RUN py -%PYTHON_VERSION% -m pip install -r C:/arrow/python/requirements-wheel-build.txt

ENV PYTHON_CMD="py -${python}${python_variant_suffix}"

ENV PYTHON=${python}
3 changes: 1 addition & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,6 @@ services:
args:
base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
python: ${PYTHON}
python_variant: default
context: .
dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
# This should make the pushed images reusable, but the image gets rebuilt.
Expand All @@ -1405,7 +1404,7 @@ services:
args:
base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
python: ${PYTHON}
python_variant: freethreaded
python_variant_suffix: t
context: .
dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
# This should make the pushed images reusable, but the image gets rebuilt.
Expand Down
Loading