From 58805bc04ac320a30868c0931e69d4ccdec61915 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Tue, 9 Apr 2024 11:30:08 +0200
Subject: [PATCH 1/2] GH-39848: [Python][Packaging] Build pyarrow wheels with
 numpy RC instead of nightly

---
 ci/docker/python-wheel-manylinux.dockerfile      | 3 +--
 ci/docker/python-wheel-windows-vs2019.dockerfile | 3 +--
 ci/scripts/python_wheel_macos_build.sh           | 5 +----
 python/requirements-wheel-build.txt              | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile
index b1d9ed5ab88d9..63fd7b1d46820 100644
--- a/ci/docker/python-wheel-manylinux.dockerfile
+++ b/ci/docker/python-wheel-manylinux.dockerfile
@@ -99,5 +99,4 @@ SHELL ["/bin/bash", "-i", "-c"]
 ENTRYPOINT ["/bin/bash", "-i", "-c"]
 
 COPY python/requirements-wheel-build.txt /arrow/python/
-# TODO(GH-39848) Remove the `--pre --extra-index-url` for numpy nightly again before the 16.0 release 
-RUN pip install -r /arrow/python/requirements-wheel-build.txt --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
+RUN pip install -r /arrow/python/requirements-wheel-build.txt
diff --git a/ci/docker/python-wheel-windows-vs2019.dockerfile b/ci/docker/python-wheel-windows-vs2019.dockerfile
index 0ab5071abb86c..ff42de939d91f 100644
--- a/ci/docker/python-wheel-windows-vs2019.dockerfile
+++ b/ci/docker/python-wheel-windows-vs2019.dockerfile
@@ -89,8 +89,7 @@ RUN choco install -r -y --no-progress python --version=%PYTHON_VERSION%
 RUN python -m pip install -U pip setuptools
 
 COPY python/requirements-wheel-build.txt arrow/python/
-# TODO(GH-39848) Remove the `--pre --extra-index-url` for numpy nightly again before the 16.0 release 
-RUN python -m pip install -r arrow/python/requirements-wheel-build.txt --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
+RUN python -m pip install -r arrow/python/requirements-wheel-build.txt
 
 # ENV CLCACHE_DIR="C:\clcache"
 # ENV CLCACHE_COMPRESS=1
diff --git a/ci/scripts/python_wheel_macos_build.sh b/ci/scripts/python_wheel_macos_build.sh
index a94dac40e931f..3ed9d5d8dd12f 100755
--- a/ci/scripts/python_wheel_macos_build.sh
+++ b/ci/scripts/python_wheel_macos_build.sh
@@ -50,15 +50,12 @@ echo "=== (${PYTHON_VERSION}) Install Python build dependencies ==="
 export PIP_SITE_PACKAGES=$(python -c 'import site; print(site.getsitepackages()[0])')
 export PIP_TARGET_PLATFORM="macosx_${MACOSX_DEPLOYMENT_TARGET//./_}_${arch}"
 
-# TODO(GH-39848) Remove the `--pre --extra-index-url` for numpy nightly again before the 16.0 release 
 pip install \
   --upgrade \
   --only-binary=:all: \
   --target $PIP_SITE_PACKAGES \
   --platform $PIP_TARGET_PLATFORM \
-  -r ${source_dir}/python/requirements-wheel-build.txt \
-  --pre \
-  --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
+  -r ${source_dir}/python/requirements-wheel-build.txt
 pip install "delocate>=0.10.3"
 
 echo "=== (${PYTHON_VERSION}) Building Arrow C++ libraries ==="
diff --git a/python/requirements-wheel-build.txt b/python/requirements-wheel-build.txt
index 9920a38a4e288..3ea57b611f9d8 100644
--- a/python/requirements-wheel-build.txt
+++ b/python/requirements-wheel-build.txt
@@ -1,6 +1,6 @@
 cython>=0.29.31
 oldest-supported-numpy>=0.14; python_version<'3.9'
-numpy>=1.25; python_version>='3.9'
+numpy>=2.0.0rc1; python_version>='3.9'
 setuptools_scm
 setuptools>=58
 wheel

From e257d49111173b70d5e6031526eb0afcbba97294 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Tue, 9 Apr 2024 11:31:35 +0200
Subject: [PATCH 2/2] trigger rebuild of windows docker image

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

diff --git a/.env b/.env
index 298c100c094b0..65bb46c838bee 100644
--- a/.env
+++ b/.env
@@ -98,7 +98,7 @@ VCPKG="a42af01b72c28a8e1d7b48107b33e4f286a55ef6"    # 2023.11.20 Release
 # ci/docker/python-wheel-windows-vs2019.dockerfile.
 # This is a workaround for our CI problem that "archery docker build" doesn't
 # use pulled built images in dev/tasks/python-wheels/github.windows.yml.
-PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-03-19
+PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-04-09
 
 # Use conanio/${CONAN} for "docker-compose run --rm conan". See
 # https://github.com/conan-io/conan-docker-tools#readme for available