From f6782e515675a00f2003f9e5f8a7632a4e379623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 10 Oct 2024 17:49:09 +0200 Subject: [PATCH] GH-43519: [Python][Packaging] Use official Python 3.13 version instead of Release Candidates --- ci/docker/python-wheel-windows-test-vs2019.dockerfile | 4 ++-- ci/docker/python-wheel-windows-vs2019.dockerfile | 4 ++-- ci/scripts/install_python.sh | 10 ++++------ dev/tasks/python-wheels/github.linux.yml | 3 --- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ci/docker/python-wheel-windows-test-vs2019.dockerfile b/ci/docker/python-wheel-windows-test-vs2019.dockerfile index 564bca329f3cb..7ed84926bc1d9 100644 --- a/ci/docker/python-wheel-windows-test-vs2019.dockerfile +++ b/ci/docker/python-wheel-windows-test-vs2019.dockerfile @@ -53,8 +53,8 @@ ARG python=3.9 RUN (if "%python%"=="3.9" setx PYTHON_VERSION "3.9.13") & \ (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11") & \ (if "%python%"=="3.11" setx PYTHON_VERSION "3.11.9") & \ - (if "%python%"=="3.12" setx PYTHON_VERSION "3.12.5") & \ - (if "%python%"=="3.13" setx PYTHON_VERSION "3.13.0-rc1") + (if "%python%"=="3.12" setx PYTHON_VERSION "3.12.6") & \ + (if "%python%"=="3.13" setx PYTHON_VERSION "3.13.0-rc2") # Install archiver to extract xz archives RUN choco install -r -y --pre --no-progress --force python --version=%PYTHON_VERSION% && \ diff --git a/ci/docker/python-wheel-windows-vs2019.dockerfile b/ci/docker/python-wheel-windows-vs2019.dockerfile index f9d31eb5771ef..3f26efd4bf12e 100644 --- a/ci/docker/python-wheel-windows-vs2019.dockerfile +++ b/ci/docker/python-wheel-windows-vs2019.dockerfile @@ -83,8 +83,8 @@ ARG python=3.9 RUN (if "%python%"=="3.9" setx PYTHON_VERSION "3.9.13" && setx PATH "%PATH%;C:\Python39;C:\Python39\Scripts") & \ (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11" && setx PATH "%PATH%;C:\Python310;C:\Python310\Scripts") & \ (if "%python%"=="3.11" setx PYTHON_VERSION "3.11.9" && setx PATH "%PATH%;C:\Python311;C:\Python311\Scripts") & \ - (if "%python%"=="3.12" setx PYTHON_VERSION "3.12.5" && setx PATH "%PATH%;C:\Python312;C:\Python312\Scripts") & \ - (if "%python%"=="3.13" setx PYTHON_VERSION "3.13.0-rc1" && setx PATH "%PATH%;C:\Python313;C:\Python313\Scripts") + (if "%python%"=="3.12" setx PYTHON_VERSION "3.12.6" && setx PATH "%PATH%;C:\Python312;C:\Python312\Scripts") & \ + (if "%python%"=="3.13" setx PYTHON_VERSION "3.13.0-rc2" && setx PATH "%PATH%;C:\Python313;C:\Python313\Scripts") RUN choco install -r -y --pre --no-progress python --version=%PYTHON_VERSION% RUN python -m pip install -U pip setuptools diff --git a/ci/scripts/install_python.sh b/ci/scripts/install_python.sh index 0f8a0804691e7..97a344b7bc2a5 100755 --- a/ci/scripts/install_python.sh +++ b/ci/scripts/install_python.sh @@ -28,7 +28,7 @@ declare -A versions versions=([3.9]=3.9.13 [3.10]=3.10.11 [3.11]=3.11.9 - [3.12]=3.12.5 + [3.12]=3.12.7 [3.13]=3.13.0 [3.13t]=3.13.0) @@ -47,13 +47,11 @@ full_version=${versions[$2]} if [ $platform = "macOS" ]; then echo "Downloading Python installer..." - if [ "$version" = "3.13" ] || [ "$version" = "3.13t" ]; - then - fname="python-${full_version}rc2-macos11.pkg" - elif [ "$(uname -m)" = "arm64" ] || \ + if [ "$(uname -m)" = "arm64" ] || \ [ "$version" = "3.10" ] || \ [ "$version" = "3.11" ] || \ - [ "$version" = "3.12" ]; + [ "$version" = "3.12" ] || \ + [ "$version" = "3.13" ]; then fname="python-${full_version}-macos11.pkg" else diff --git a/dev/tasks/python-wheels/github.linux.yml b/dev/tasks/python-wheels/github.linux.yml index 7a1c8fb4f9d80..f98a9925f038c 100644 --- a/dev/tasks/python-wheels/github.linux.yml +++ b/dev/tasks/python-wheels/github.linux.yml @@ -36,9 +36,6 @@ jobs: {% endif %} PYTHON: "{{ python_version }}" PYTHON_ABI_TAG: "{{ python_abi_tag }}" - {% if python_version == "3.13" %} - PYTHON_IMAGE_TAG: "3.13-rc" - {% else %} PYTHON_IMAGE_TAG: "{{ python_version }}" {% endif %}