From 835245658f1451fe7538a503f561332d66250b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Fri, 15 Mar 2024 12:16:09 +0100
Subject: [PATCH 1/2] GH-40535: [Docs][R] Set RETICULATE_PYTHON_ENV in order to
 find pyarrow

---
 ci/docker/linux-apt-docs.dockerfile | 3 +++
 ci/scripts/r_build.sh               | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile
index c424d04653d..d4b229b6693 100644
--- a/ci/docker/linux-apt-docs.dockerfile
+++ b/ci/docker/linux-apt-docs.dockerfile
@@ -76,6 +76,9 @@ RUN apt-get purge -y npm && \
     rm -rf /var/lib/apt/lists/* && \
     npm install -g yarn
 
+# Expose ARROW_PYTHON_VENV from BASE
+ENV ARROW_PYTHON_VENV /arrow-dev
+
 COPY docs/requirements.txt /arrow/docs/
 RUN pip install -r arrow/docs/requirements.txt meson
 
diff --git a/ci/scripts/r_build.sh b/ci/scripts/r_build.sh
index 38b54e44340..7dffa5b0ba5 100755
--- a/ci/scripts/r_build.sh
+++ b/ci/scripts/r_build.sh
@@ -31,6 +31,9 @@ ${R_BIN} CMD build .
 ${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
 
 if [ "${BUILD_DOCS_R}" == "ON" ]; then
+  if [ -n "${ARROW_PYTHON_VENV:-}" ]; then
+    RETICULATE_PYTHON_ENV=${ARROW_PYTHON_VENV}
+  fi
   ${R_BIN} -e "pkgdown::build_site(install = FALSE)"
   rsync -a ${source_dir}/docs/ ${build_dir}/docs/r
 fi

From 655388d6a2310b23e7496d9918b28cd635e02ba3 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 16 Mar 2024 16:00:34 +0900
Subject: [PATCH 2/2] Set RETICULATE_PYTHON_ENV in linux-apt-docs.dockerfile

---
 ci/docker/linux-apt-docs.dockerfile | 11 ++++++-----
 ci/scripts/r_build.sh               |  3 ---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile
index d4b229b6693..5ac39424ed5 100644
--- a/ci/docker/linux-apt-docs.dockerfile
+++ b/ci/docker/linux-apt-docs.dockerfile
@@ -46,6 +46,7 @@ RUN apt-get update -y && \
         libtiff-dev \
         libtool \
         libxml2-dev \
+        meson \
         ninja-build \
         nvidia-cuda-toolkit \
         openjdk-${jdk}-jdk-headless \
@@ -76,11 +77,10 @@ RUN apt-get purge -y npm && \
     rm -rf /var/lib/apt/lists/* && \
     npm install -g yarn
 
-# Expose ARROW_PYTHON_VENV from BASE
-ENV ARROW_PYTHON_VENV /arrow-dev
-
 COPY docs/requirements.txt /arrow/docs/
-RUN pip install -r arrow/docs/requirements.txt meson
+RUN python3 -m venv ${ARROW_PYTHON_VENV} && \
+    . ${ARROW_PYTHON_VENV}/bin/activate && \
+    pip install -r arrow/docs/requirements.txt
 
 COPY c_glib/Gemfile /arrow/c_glib/
 RUN gem install --no-document bundler && \
@@ -114,4 +114,5 @@ ENV ARROW_ACERO=ON \
     ARROW_JSON=ON \
     ARROW_S3=ON \
     ARROW_USE_GLOG=OFF \
-    CMAKE_UNITY_BUILD=ON
+    CMAKE_UNITY_BUILD=ON \
+    RETICULATE_PYTHON_ENV=${ARROW_PYTHON_VENV}
diff --git a/ci/scripts/r_build.sh b/ci/scripts/r_build.sh
index 7dffa5b0ba5..38b54e44340 100755
--- a/ci/scripts/r_build.sh
+++ b/ci/scripts/r_build.sh
@@ -31,9 +31,6 @@ ${R_BIN} CMD build .
 ${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
 
 if [ "${BUILD_DOCS_R}" == "ON" ]; then
-  if [ -n "${ARROW_PYTHON_VENV:-}" ]; then
-    RETICULATE_PYTHON_ENV=${ARROW_PYTHON_VENV}
-  fi
   ${R_BIN} -e "pkgdown::build_site(install = FALSE)"
   rsync -a ${source_dir}/docs/ ${build_dir}/docs/r
 fi