This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new e90bacded2 GH-48280: [CI] PYTHON_PATCH_VERSION docker warnings (#48282)
e90bacded2 is described below
commit e90bacded2ae5a34be11c764e00751c18ab3b355
Author: Alenka Frim <[email protected]>
AuthorDate: Wed Dec 3 23:07:17 2025 +0100
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]>
---
.../python-free-threaded-wheel-musllinux-test-imports.dockerfile | 8 ++++++--
...python-free-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 | 8 --------
7 files changed, 16 insertions(+), 18 deletions(-)
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 e79facb490..3168d54f2e 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 3b170087ba..c6873612b8 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 1bed37eb00..e5d1c51758 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 04750ff44c..48d3937a0e 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 fe0c4bcb93..c683d2b883 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 8abc9ad660..bf3e05e613 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1248,7 +1248,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:
@@ -1291,7 +1290,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 5abe289dec..9776a3c588 100644
--- a/dev/tasks/python-wheels/github.linux.yml
+++ b/dev/tasks/python-wheels/github.linux.yml
@@ -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 }}
