From 0bc40f36f05d3f32429a742985b7b7ef7cc19479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Mon, 16 Sep 2024 10:53:03 +0200
Subject: [PATCH] Remove manual Python installation from Ubuntu 20.04

---
 ci/docker/linux-apt-python-3.dockerfile | 14 --------------
 ci/scripts/install_python.sh            | 23 -----------------------
 ci/scripts/r_test.sh                    |  2 +-
 docker-compose.yml                      | 24 +++++++++---------------
 4 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/ci/docker/linux-apt-python-3.dockerfile b/ci/docker/linux-apt-python-3.dockerfile
index 65fc78d796cee..e215976d44850 100644
--- a/ci/docker/linux-apt-python-3.dockerfile
+++ b/ci/docker/linux-apt-python-3.dockerfile
@@ -24,20 +24,6 @@ COPY python/requirements-build.txt \
 
 ENV ARROW_PYTHON_VENV /arrow-dev
 
-ARG ubuntu
-ARG python="3.12"
-COPY ci/scripts/install_python.sh /arrow/ci/scripts/
-# Ubuntu 20.04 uses python 3.8 which is unsuported for pyarrow
-RUN if [ "${ubuntu}" = "20.04" ]; then \
-        quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
-        apt update ${quiet} && \
-        apt install -y -V ${quiet} \
-          xz-utils && \
-        apt clean && \
-        rm -rf /var/lib/apt/lists/* && \
-        /arrow/ci/scripts/install_python.sh linux ${python} \
-    ; fi
-
 RUN python3 -m venv ${ARROW_PYTHON_VENV} && \
     . ${ARROW_PYTHON_VENV}/bin/activate && \
     pip install -U pip setuptools wheel && \
diff --git a/ci/scripts/install_python.sh b/ci/scripts/install_python.sh
index 5d9f6e610a304..21d8a16e3c2b8 100755
--- a/ci/scripts/install_python.sh
+++ b/ci/scripts/install_python.sh
@@ -68,29 +68,6 @@ if [ $platform = "macOS" ]; then
     python="/Library/Frameworks/Python.framework/Versions/${version}/bin/python${version}"
     pip="${python} -m pip"
 
-    $python -m ensurepip
-    $pip install -U pip setuptools
-elif [ $platform = "Linux" ] ; then
-    echo "Downloading Python installer..."
-
-    if [ "$version" = "3.13" ];
-    then
-        fname="Python-${full_version}rc1.tar.xz"
-    else
-        fname="Python-${full_version}.tar.xz"
-    fi
-    wget "https://www.python.org/ftp/python/${full_version}/${fname}"
-
-    echo "Building and installing Python..."
-    tar -xf ${fname}
-    rm $fname
-    pushd Python-3.*
-    ./configure
-    make install
-    popd
-    python=/usr/local/bin/python3
-    pip="${python} -m pip"
-
     $python -m ensurepip
     $pip install -U pip setuptools
 else
diff --git a/ci/scripts/r_test.sh b/ci/scripts/r_test.sh
index 13b103f972a80..d5fd78914755e 100755
--- a/ci/scripts/r_test.sh
+++ b/ci/scripts/r_test.sh
@@ -102,7 +102,7 @@ SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
   if (requireNamespace('reticulate', quietly = TRUE) && reticulate::py_module_available('pyarrow')) {
       message('Running flight demo server for tests.')
       pid_flight <- sys::exec_background(
-          'python3',
+          'python',
           c(
               '-c',
               paste0(
diff --git a/docker-compose.yml b/docker-compose.yml
index fb3c76080c235..97c9cd7c4a37f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -917,19 +917,17 @@ services:
     # Parameters:
     #   ARCH: amd64
     #   CUDA: <depends on your nvidia driver, should match system CUDA>
-    #   UBUNTU: 20.04, 22.04, ...
+    #   UBUNTU: 22.04, 24.04
     #   PYTHON: 3.9, 3.10, 3.11, ...
-    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cuda-${CUDA}-python-${PYTHON}
+    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cuda-${CUDA}-python-3
     build:
       context: .
       dockerfile: ci/docker/linux-apt-python-3.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cuda-${CUDA}-python-${PYTHON}
+        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cuda-${CUDA}-python-3
       args:
         base: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cuda-${CUDA}-cpp
         numba: ${NUMBA}
-        ubuntu: ${UBUNTU}
-        python: ${PYTHON}
     shm_size: *shm-size
     environment:
       <<: [*common, *ccache, *sccache]
@@ -988,18 +986,16 @@ services:
     #   docker-compose run --rm ubuntu-python
     # Parameters:
     #   ARCH: amd64, arm64v8, ...
-    #   UBUNTU: 20.04, 22.04
+    #   UBUNTU: 22.04, 24.04
     #   PYTHON: 3.9, 3.10, ...
-    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-${PYTHON}
+    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-3
     build:
       context: .
       dockerfile: ci/docker/linux-apt-python-3.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-${PYTHON}
+        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-3
       args:
         base: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp
-        ubuntu: ${UBUNTU}
-        python: ${PYTHON}
     shm_size: *shm-size
     environment:
       <<: [*common, *ccache]
@@ -1071,18 +1067,16 @@ services:
     # Parameters:
     #   ARCH: amd64, arm64v8, ...
     #   PYARROW_VERSION: The test target pyarrow version such as "3.0.0"
-    #   UBUNTU: 20.04, 22.04
+    #   UBUNTU: 22.04, 24.04
     #   PYTHON: 3.9, 3.10, 3.11, ...
-    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-${PYTHON}
+    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-3
     build:
       context: .
       dockerfile: ci/docker/linux-apt-python-3.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-${PYTHON}
+        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-3
       args:
         base: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp
-        ubuntu: ${UBUNTU}
-        python: ${PYTHON}
     shm_size: *shm-size
     environment:
       <<: [*common, *ccache]