From a0b24e5fac9d23071d20b510835b89cd6a506cc1 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 12 Sep 2024 19:05:13 +0200 Subject: [PATCH 1/2] DRAFT: [CI][Python] Enable S3 testing for Windows wheels --- ci/docker/python-wheel-windows-test-vs2019.dockerfile | 3 +++ ci/scripts/python_wheel_windows_test.bat | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/docker/python-wheel-windows-test-vs2019.dockerfile b/ci/docker/python-wheel-windows-test-vs2019.dockerfile index 625ab25f848..c006594f793 100644 --- a/ci/docker/python-wheel-windows-test-vs2019.dockerfile +++ b/ci/docker/python-wheel-windows-test-vs2019.dockerfile @@ -35,6 +35,9 @@ RUN setx path "%path%;C:\Program Files\Git\usr\bin" RUN wmic product where "name like 'python%%'" call uninstall /nointeractive && \ rm -rf Python* +RUN curl https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z \ + --output "C:\Windows\Minio.exe" + # Install the GCS testbench using a well-known Python version. # NOTE: cannot use pipx's `--fetch-missing-python` because of # https://github.com/pypa/pipx/issues/1521, therefore download Python ourselves. diff --git a/ci/scripts/python_wheel_windows_test.bat b/ci/scripts/python_wheel_windows_test.bat index de5a2c2e965..ae5b7e36ad7 100755 --- a/ci/scripts/python_wheel_windows_test.bat +++ b/ci/scripts/python_wheel_windows_test.bat @@ -28,7 +28,7 @@ set PYARROW_TEST_ORC=ON set PYARROW_TEST_PARQUET=ON set PYARROW_TEST_PARQUET_ENCRYPTION=ON set PYARROW_TEST_SUBSTRAIT=ON -set PYARROW_TEST_S3=OFF +set PYARROW_TEST_S3=ON set PYARROW_TEST_TENSORFLOW=ON @REM Enable again once https://github.com/scipy/oldest-supported-numpy/pull/27 gets merged From 7ee91865cb78d85678847c95a8e135784a108735 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 12 Sep 2024 20:52:48 +0200 Subject: [PATCH 2/2] Fix lint --- ci/docker/python-wheel-windows-test-vs2019.dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/docker/python-wheel-windows-test-vs2019.dockerfile b/ci/docker/python-wheel-windows-test-vs2019.dockerfile index c006594f793..bffc1bd13d6 100644 --- a/ci/docker/python-wheel-windows-test-vs2019.dockerfile +++ b/ci/docker/python-wheel-windows-test-vs2019.dockerfile @@ -27,16 +27,16 @@ FROM abrarov/msvc-2019:2.11.0 # Add unix tools to path RUN setx path "%path%;C:\Program Files\Git\usr\bin" -# Remove previous installations of python from the base image +# 1. Remove previous installations of python from the base image # NOTE: a more recent base image (tried with 2.12.1) comes with python 3.9.7 # and the msi installers are failing to remove pip and tcl/tk "products" making # the subsequent choco python installation step failing for installing python # version 3.9.* due to existing python version +# 2. Install Minio for S3 testing. RUN wmic product where "name like 'python%%'" call uninstall /nointeractive && \ - rm -rf Python* - -RUN curl https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z \ - --output "C:\Windows\Minio.exe" + rm -rf Python* && \ + curl https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z \ + --output "C:\Windows\Minio.exe" # Install the GCS testbench using a well-known Python version. # NOTE: cannot use pipx's `--fetch-missing-python` because of