From 7d1e71031a7bcce43c61acb9b4cfd77722d9380b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Tue, 7 Oct 2025 10:07:44 +0200
Subject: [PATCH 1/2] GH-875: [CI] Bump default Python version on .env so
 dependencies like archery are installable on CI

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index d3e1c1d63..5606f73aa 100644
--- a/.env
+++ b/.env
@@ -53,5 +53,5 @@ MAVEN=3.9.9
 # Versions for various dependencies used to build artifacts
 # Keep in sync with apache/arrow
 ARROW_REPO_ROOT=./arrow
-PYTHON=3.9
+PYTHON=3.12
 VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release

From 99d0f4ed8591a81a9c67dc39e74fbadccc7da214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Tue, 7 Oct 2025 10:18:41 +0200
Subject: [PATCH 2/2] Add Python as part of image name so it's not cached if we
 update Python version

---
 compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index b125c3c98..d3e0ff7c6 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -92,12 +92,12 @@ services:
     # Usage:
     #   docker compose build vcpkg-jni
     #   docker compose run vcpkg-jni
-    image: ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
+    image: ${REPO}:${ARCH}-vcpkg-jni-${PYTHON}-${VCPKG}
     build:
       context: .
       dockerfile: ci/docker/vcpkg-jni.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
+        - ${REPO}:${ARCH}-vcpkg-jni-${PYTHON}-${VCPKG}
       args:
         base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
     volumes: