Skip to content
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ ARG base
FROM ${base}

ARG python_version=3.13
ARG python_patch_version=3.13.7

RUN apk add --no-cache \
bash \
Expand All @@ -38,7 +37,12 @@ RUN apk add --no-cache \
zlib-dev

# Install Python without GIL
RUN wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
RUN set -e; \
case "${python_version}" in \
3.13) python_patch_version="3.13.9";; \
3.14) python_patch_version="3.14.0";; \
esac && \
wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
tar -xzf v${python_patch_version}.tar.gz && \
rm v${python_patch_version}.tar.gz && \
cd cpython-${python_patch_version}/ && \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ ARG base
FROM ${base}

ARG python_version=3.13
ARG python_patch_version=3.13.7

RUN apk add --no-cache \
bash \
Expand All @@ -38,7 +37,12 @@ RUN apk add --no-cache \
zlib-dev

# Install Python without GIL
RUN wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
RUN set -e; \
case "${python_version}" in \
3.13) python_patch_version="3.13.9";; \
3.14) python_patch_version="3.14.0";; \
esac && \
wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
tar -xzf v${python_patch_version}.tar.gz && \
rm v${python_patch_version}.tar.gz && \
cd cpython-${python_patch_version}/ && \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/python-wheel-windows-test-vs2022.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ARG python=3.10
RUN (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11" && setx PYTHON_CMD "py -3.10") & \
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.9" && setx PYTHON_CMD "py -3.11") & \
(if "%python%"=="3.12" setx PYTHON_VERSION "3.12.10" && setx PYTHON_CMD "py -3.12") & \
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.7" && setx PYTHON_CMD "py -3.13") & \
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.9" && setx PYTHON_CMD "py -3.13") & \
(if "%python%"=="3.14" setx PYTHON_VERSION "3.14.0" && setx PYTHON_CMD "py -3.14")

# hadolint ignore=DL3059
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/python-wheel-windows-vs2022.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ARG python=3.10
RUN (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11" && setx PYTHON_CMD "py -3.10") & \
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.9" && setx PYTHON_CMD "py -3.11") & \
(if "%python%"=="3.12" setx PYTHON_VERSION "3.12.10" && setx PYTHON_CMD "py -3.12") & \
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.7" && setx PYTHON_CMD "py -3.13") & \
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.9" && setx PYTHON_CMD "py -3.13") & \
(if "%python%"=="3.14" setx PYTHON_VERSION "3.14.0" && setx PYTHON_CMD "py -3.14")

RUN choco install -r -y --pre --no-progress python --version=%PYTHON_VERSION%
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/install_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ declare -A versions
versions=([3.10]=3.10.11
[3.11]=3.11.9
[3.12]=3.12.10
[3.13]=3.13.7
[3.13t]=3.13.7
[3.13]=3.13.9
[3.13t]=3.13.9
[3.14]=3.14.0
[3.14t]=3.14.0)

Expand Down
2 changes: 0 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,6 @@ services:
args:
base: "${ARCH}/alpine:${ALPINE_LINUX}"
python_version: ${PYTHON}
python_patch_version: ${PYTHON_PATCH_VERSION}
context: .
dockerfile: ci/docker/python-free-threaded-wheel-musllinux-test-imports.dockerfile
cache_from:
Expand Down Expand Up @@ -1290,7 +1289,6 @@ services:
args:
base: "${ARCH}/alpine:${ALPINE_LINUX}"
python_version: ${PYTHON}
python_patch_version: ${PYTHON_PATCH_VERSION}
context: .
dockerfile: ci/docker/python-free-threaded-wheel-musllinux-test-unittests.dockerfile
cache_from:
Expand Down
8 changes: 0 additions & 8 deletions dev/tasks/python-wheels/github.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,7 @@ jobs:
{% endif %}
PYTHON: "{{ python_version }}"
PYTHON_ABI_TAG: "{{ python_abi_tag }}"
{% if python_version == "3.14" %}
PYTHON_IMAGE_TAG: "3.14"
PYTHON_PATCH_VERSION: "3.14.0"
{% elif python_version == "3.13" %}
PYTHON_IMAGE_TAG: "{{ python_version }}"
PYTHON_PATCH_VERSION: "3.13.7"
{% else %}
PYTHON_IMAGE_TAG: "{{ python_version }}"
{% endif %}

steps:
{{ macros.github_checkout_arrow()|indent }}
Expand Down
Loading