Skip to content

Commit e90bacd

Browse files
authored
GH-48280: [CI] PYTHON_PATCH_VERSION docker warnings (#48282)
### Rationale for this change Warnings in the docker compose step, see https://github.com/ursacomputing/crossbow/actions/runs/19167940422/job/54793047049#step:7:55 ### What changes are included in this PR? Instead of adding `PYTHON_PATCH_VERSION` to `.env` I have moved the use of the patch version to the free-threaded musllinux jobs as `PYTHON_PATCH_VERSION` was only needed there. I have also updated all Python patch versions from `3.13.7` to `3.13.9`. ### Are these changes tested? Yes, CI and extended python wheels builds should pass. ### Are there any user-facing changes? No. * GitHub Issue: #48280 Authored-by: AlenkaF <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent dcfb211 commit e90bacd

7 files changed

+16
-18
lines changed

ci/docker/python-free-threaded-wheel-musllinux-test-imports.dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ ARG base
1919
FROM ${base}
2020

2121
ARG python_version=3.13
22-
ARG python_patch_version=3.13.7
2322

2423
RUN apk add --no-cache \
2524
bash \
@@ -38,7 +37,12 @@ RUN apk add --no-cache \
3837
zlib-dev
3938

4039
# Install Python without GIL
41-
RUN wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
40+
RUN set -e; \
41+
case "${python_version}" in \
42+
3.13) python_patch_version="3.13.9";; \
43+
3.14) python_patch_version="3.14.0";; \
44+
esac && \
45+
wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
4246
tar -xzf v${python_patch_version}.tar.gz && \
4347
rm v${python_patch_version}.tar.gz && \
4448
cd cpython-${python_patch_version}/ && \

ci/docker/python-free-threaded-wheel-musllinux-test-unittests.dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ ARG base
1919
FROM ${base}
2020

2121
ARG python_version=3.13
22-
ARG python_patch_version=3.13.7
2322

2423
RUN apk add --no-cache \
2524
bash \
@@ -38,7 +37,12 @@ RUN apk add --no-cache \
3837
zlib-dev
3938

4039
# Install Python without GIL
41-
RUN wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
40+
RUN set -e; \
41+
case "${python_version}" in \
42+
3.13) python_patch_version="3.13.9";; \
43+
3.14) python_patch_version="3.14.0";; \
44+
esac && \
45+
wget https://github.com/python/cpython/archive/refs/tags/v${python_patch_version}.tar.gz && \
4246
tar -xzf v${python_patch_version}.tar.gz && \
4347
rm v${python_patch_version}.tar.gz && \
4448
cd cpython-${python_patch_version}/ && \

ci/docker/python-wheel-windows-test-vs2022.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARG python=3.10
3131
RUN (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11" && setx PYTHON_CMD "py -3.10") & \
3232
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.9" && setx PYTHON_CMD "py -3.11") & \
3333
(if "%python%"=="3.12" setx PYTHON_VERSION "3.12.10" && setx PYTHON_CMD "py -3.12") & \
34-
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.7" && setx PYTHON_CMD "py -3.13") & \
34+
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.9" && setx PYTHON_CMD "py -3.13") & \
3535
(if "%python%"=="3.14" setx PYTHON_VERSION "3.14.0" && setx PYTHON_CMD "py -3.14")
3636

3737
# hadolint ignore=DL3059

ci/docker/python-wheel-windows-vs2022.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ARG python=3.10
2626
RUN (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11" && setx PYTHON_CMD "py -3.10") & \
2727
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.9" && setx PYTHON_CMD "py -3.11") & \
2828
(if "%python%"=="3.12" setx PYTHON_VERSION "3.12.10" && setx PYTHON_CMD "py -3.12") & \
29-
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.7" && setx PYTHON_CMD "py -3.13") & \
29+
(if "%python%"=="3.13" setx PYTHON_VERSION "3.13.9" && setx PYTHON_CMD "py -3.13") & \
3030
(if "%python%"=="3.14" setx PYTHON_VERSION "3.14.0" && setx PYTHON_CMD "py -3.14")
3131

3232
RUN choco install -r -y --pre --no-progress python --version=%PYTHON_VERSION%

ci/scripts/install_python.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ declare -A versions
2828
versions=([3.10]=3.10.11
2929
[3.11]=3.11.9
3030
[3.12]=3.12.10
31-
[3.13]=3.13.7
32-
[3.13t]=3.13.7
31+
[3.13]=3.13.9
32+
[3.13t]=3.13.9
3333
[3.14]=3.14.0
3434
[3.14t]=3.14.0)
3535

compose.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,6 @@ services:
12481248
args:
12491249
base: "${ARCH}/alpine:${ALPINE_LINUX}"
12501250
python_version: ${PYTHON}
1251-
python_patch_version: ${PYTHON_PATCH_VERSION}
12521251
context: .
12531252
dockerfile: ci/docker/python-free-threaded-wheel-musllinux-test-imports.dockerfile
12541253
cache_from:
@@ -1291,7 +1290,6 @@ services:
12911290
args:
12921291
base: "${ARCH}/alpine:${ALPINE_LINUX}"
12931292
python_version: ${PYTHON}
1294-
python_patch_version: ${PYTHON_PATCH_VERSION}
12951293
context: .
12961294
dockerfile: ci/docker/python-free-threaded-wheel-musllinux-test-unittests.dockerfile
12971295
cache_from:

dev/tasks/python-wheels/github.linux.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,7 @@ jobs:
4242
{% endif %}
4343
PYTHON: "{{ python_version }}"
4444
PYTHON_ABI_TAG: "{{ python_abi_tag }}"
45-
{% if python_version == "3.14" %}
46-
PYTHON_IMAGE_TAG: "3.14"
47-
PYTHON_PATCH_VERSION: "3.14.0"
48-
{% elif python_version == "3.13" %}
4945
PYTHON_IMAGE_TAG: "{{ python_version }}"
50-
PYTHON_PATCH_VERSION: "3.13.7"
51-
{% else %}
52-
PYTHON_IMAGE_TAG: "{{ python_version }}"
53-
{% endif %}
5446

5547
steps:
5648
{{ macros.github_checkout_arrow()|indent }}

0 commit comments

Comments
 (0)