From 4fcbcb25b2bb1a8fe06d2cce286c4e037b77f033 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 10 Oct 2024 20:35:00 +0200 Subject: [PATCH] GH-43519: [Python][CI] Update Python 3.13 rc to final 3.13.0 --- .../python-wheel-windows-test-vs2019.dockerfile | 2 +- ci/docker/python-wheel-windows-vs2019.dockerfile | 2 +- ci/scripts/install_python.sh | 12 +++--------- dev/tasks/python-wheels/github.linux.yml | 4 ---- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ci/docker/python-wheel-windows-test-vs2019.dockerfile b/ci/docker/python-wheel-windows-test-vs2019.dockerfile index 564bca329f3cb..31965c21ca76b 100644 --- a/ci/docker/python-wheel-windows-test-vs2019.dockerfile +++ b/ci/docker/python-wheel-windows-test-vs2019.dockerfile @@ -54,7 +54,7 @@ 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.13" setx PYTHON_VERSION "3.13.0") # 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..58027a1da6def 100644 --- a/ci/docker/python-wheel-windows-vs2019.dockerfile +++ b/ci/docker/python-wheel-windows-vs2019.dockerfile @@ -84,7 +84,7 @@ RUN (if "%python%"=="3.9" setx PYTHON_VERSION "3.9.13" && setx PATH "%PATH%;C:\P (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.13" setx PYTHON_VERSION "3.13.0" && 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..28ed6c6c4d2e2 100755 --- a/ci/scripts/install_python.sh +++ b/ci/scripts/install_python.sh @@ -47,17 +47,11 @@ full_version=${versions[$2]} if [ $platform = "macOS" ]; then echo "Downloading Python installer..." - if [ "$version" = "3.13" ] || [ "$version" = "3.13t" ]; + if [ "$(uname -m)" = "x86_64" ] && [ "$version" = "3.9" ]; then - fname="python-${full_version}rc2-macos11.pkg" - elif [ "$(uname -m)" = "arm64" ] || \ - [ "$version" = "3.10" ] || \ - [ "$version" = "3.11" ] || \ - [ "$version" = "3.12" ]; - then - fname="python-${full_version}-macos11.pkg" - else fname="python-${full_version}-macosx10.9.pkg" + else + fname="python-${full_version}-macos11.pkg" fi wget "https://www.python.org/ftp/python/${full_version}/${fname}" diff --git a/dev/tasks/python-wheels/github.linux.yml b/dev/tasks/python-wheels/github.linux.yml index 7a1c8fb4f9d80..53ad0514376c6 100644 --- a/dev/tasks/python-wheels/github.linux.yml +++ b/dev/tasks/python-wheels/github.linux.yml @@ -36,11 +36,7 @@ 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 %} steps: {{ macros.github_checkout_arrow()|indent }}