Add manual installation of Python for R Ubuntu 20.04 and update some …

…numpy pandas versions
raulcd · Sep 9, 2024 · cceb42c · cceb42c
1 parent 6417ba8
commit cceb42c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/ci/docker/linux-apt-python-3.dockerfile b/ci/docker/linux-apt-python-3.dockerfile
@@ -27,6 +27,7 @@ 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} && \

diff --git a/ci/docker/linux-apt-r.dockerfile b/ci/docker/linux-apt-r.dockerfile
@@ -55,11 +55,7 @@ RUN apt-get update -y && \
  # R CMD CHECK --as-cran needs pdflatex to build the package manual
  texlive-latex-base \
  # Need locales so we can set UTF-8
- locales \
- # Need Python to check py-to-r bridge
- python3 \
- python3-pip \
- python3-dev && \
+ locales && \
  locale-gen en_US.UTF-8 && \
  apt-get clean && \
  rm -rf /var/lib/apt/lists/*
@@ -81,9 +77,28 @@ RUN cat /arrow/ci/etc/rprofile >> $(R RHOME)/etc/Rprofile.site
 # Also ensure parallel compilation of C/C++ code
 RUN echo "MAKEFLAGS=-j$(R -s -e 'cat(parallel::detectCores())')" >> $(R RHOME)/etc/Renviron.site
 
-# Set up Python 3 and its dependencies
-RUN ln -s /usr/bin/python3 /usr/local/bin/python && \
- ln -s /usr/bin/pip3 /usr/local/bin/pip
+ARG ubuntu
+ARG python="3.12"
+COPY ci/scripts/install_python.sh /arrow/ci/scripts/
+# Need Python to check py-to-r bridge. 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} \
+ else \
+ apt update ${quiet} && \
+ apt-get install -y \
+ python3 \
+ python3-pip \
+ python3-dev && \
+ apt clean && \
+ rm -rf /var/lib/apt/lists/* \
+ ; fi
 
 COPY ci/scripts/r_deps.sh /arrow/ci/scripts/
 COPY r/DESCRIPTION /arrow/r/

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -1529,12 +1529,12 @@ tasks:
 
  ############################## Integration tests ############################
 
-{% for python_version, pandas_version, numpy_version, cache_leaf in [("3.9", "1.0", "1.19", True),
+{% for python_version, pandas_version, numpy_version, cache_leaf in [("3.9", "1.5", "1.24", True),
  ("3.10", "latest", "latest", False),
  ("3.11", "latest", "1.26", False),
  ("3.11", "latest", "latest", False),
  ("3.11", "nightly", "nightly", False),
- ("3.12", "upstream_devel", "nightly", False)] %}
+ ("3.11", "upstream_devel", "nightly", False)] %}
  test-conda-python-{{ python_version }}-pandas-{{ pandas_version }}-numpy-{{ numpy_version }}:
  ci: github
  template: docker-tests/github.linux.yml