From 85caf540908a7027d72fad2491b1190e39600f6e Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Fri, 28 Nov 2025 10:07:07 +0100 Subject: [PATCH 1/2] Add PYTHON_PATCH_VERSION to .env --- .env | 1 + dev/tasks/python-wheels/github.linux.yml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.env b/.env index 6a62cad5fcd..cb954153a62 100644 --- a/.env +++ b/.env @@ -77,6 +77,7 @@ PANDAS=latest PYTHON=3.10 PYTHON_IMAGE_TAG=3.10 PYTHON_ABI_TAG=cp310 +PYTHON_PATCH_VERSION=3.13.9 R=4.5 SPARK=master TURBODBC=latest diff --git a/dev/tasks/python-wheels/github.linux.yml b/dev/tasks/python-wheels/github.linux.yml index 5abe289dec0..0f530b50f8c 100644 --- a/dev/tasks/python-wheels/github.linux.yml +++ b/dev/tasks/python-wheels/github.linux.yml @@ -45,9 +45,6 @@ jobs: {% 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 %} From c224da28557aa3dd6d15e06fc2fc39da6f6af63e Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Fri, 28 Nov 2025 10:48:00 +0100 Subject: [PATCH 2/2] Try different approach --- .env | 1 - ...-free-threaded-wheel-musllinux-test-imports.dockerfile | 8 ++++++-- ...ree-threaded-wheel-musllinux-test-unittests.dockerfile | 8 ++++++-- ci/docker/python-wheel-windows-test-vs2022.dockerfile | 2 +- ci/docker/python-wheel-windows-vs2022.dockerfile | 2 +- ci/scripts/install_python.sh | 4 ++-- compose.yaml | 2 -- dev/tasks/python-wheels/github.linux.yml | 5 ----- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.env b/.env index cb954153a62..6a62cad5fcd 100644 --- a/.env +++ b/.env @@ -77,7 +77,6 @@ PANDAS=latest PYTHON=3.10 PYTHON_IMAGE_TAG=3.10 PYTHON_ABI_TAG=cp310 -PYTHON_PATCH_VERSION=3.13.9 R=4.5 SPARK=master TURBODBC=latest diff --git a/ci/docker/python-free-threaded-wheel-musllinux-test-imports.dockerfile b/ci/docker/python-free-threaded-wheel-musllinux-test-imports.dockerfile index e79facb4904..3168d54f2ed 100644 --- a/ci/docker/python-free-threaded-wheel-musllinux-test-imports.dockerfile +++ b/ci/docker/python-free-threaded-wheel-musllinux-test-imports.dockerfile @@ -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 \ @@ -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}/ && \ diff --git a/ci/docker/python-free-threaded-wheel-musllinux-test-unittests.dockerfile b/ci/docker/python-free-threaded-wheel-musllinux-test-unittests.dockerfile index 3b170087ba8..c6873612b86 100644 --- a/ci/docker/python-free-threaded-wheel-musllinux-test-unittests.dockerfile +++ b/ci/docker/python-free-threaded-wheel-musllinux-test-unittests.dockerfile @@ -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 \ @@ -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}/ && \ diff --git a/ci/docker/python-wheel-windows-test-vs2022.dockerfile b/ci/docker/python-wheel-windows-test-vs2022.dockerfile index 1bed37eb001..e5d1c517587 100644 --- a/ci/docker/python-wheel-windows-test-vs2022.dockerfile +++ b/ci/docker/python-wheel-windows-test-vs2022.dockerfile @@ -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 diff --git a/ci/docker/python-wheel-windows-vs2022.dockerfile b/ci/docker/python-wheel-windows-vs2022.dockerfile index 04750ff44c4..48d3937a0ed 100644 --- a/ci/docker/python-wheel-windows-vs2022.dockerfile +++ b/ci/docker/python-wheel-windows-vs2022.dockerfile @@ -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% diff --git a/ci/scripts/install_python.sh b/ci/scripts/install_python.sh index fe0c4bcb931..c683d2b883f 100755 --- a/ci/scripts/install_python.sh +++ b/ci/scripts/install_python.sh @@ -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) diff --git a/compose.yaml b/compose.yaml index e83f1446cd4..ed592b6fd8f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -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: @@ -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: diff --git a/dev/tasks/python-wheels/github.linux.yml b/dev/tasks/python-wheels/github.linux.yml index 0f530b50f8c..9776a3c588d 100644 --- a/dev/tasks/python-wheels/github.linux.yml +++ b/dev/tasks/python-wheels/github.linux.yml @@ -42,12 +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" - {% else %} PYTHON_IMAGE_TAG: "{{ python_version }}" - {% endif %} steps: {{ macros.github_checkout_arrow()|indent }}