Skip to content

Commit 796f7c7

Browse files
committed
Revert "Use pymanager to install Python for GCS testbench"
This reverts commit f4d33c2.
1 parent e4058ef commit 796f7c7

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

ci/docker/python-wheel-windows-vs2022-base.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,11 @@ RUN curl https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELE
110110
--output "C:\Windows\Minio.exe"
111111

112112
# Install the GCS testbench using a well-known Python version.
113+
# NOTE: cannot use pipx's `--fetch-missing-python` because of
114+
# https://github.com/pypa/pipx/issues/1521, therefore download Python ourselves.
115+
RUN choco install -r -y --pre --no-progress python --version=3.11.9
113116
ENV PIPX_BIN_DIR=C:\\Windows\\
114-
ENV PIPX_PYTHON_VERSION=3.11
115-
RUN pymanager install %PIPX_PYTHON_VERSION%
117+
ENV PIPX_PYTHON="C:\Python311\python.exe"
116118
COPY ci/scripts/install_gcs_testbench.bat C:/arrow/ci/scripts/
117119
RUN call "C:\arrow\ci\scripts\install_gcs_testbench.bat" && `
118120
storage-testbench -h

ci/scripts/install_gcs_testbench.bat

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@
2020
set GCS_TESTBENCH_VERSION="v0.55.0"
2121

2222
set PIPX_FLAGS=--verbose
23+
if NOT "%PIPX_PYTHON%"=="" (
24+
set PIPX_FLAGS=--python %PIPX_PYTHON% %PIPX_FLAGS%
25+
)
2326

24-
py -%PIPX_PYTHON_VERSION% -m pip install -U pipx|| exit /B 1
27+
python -m pip install -U pipx || exit /B 1
2528

2629
@REM Install GCS testbench %GCS_TESTBENCH_VERSION%
27-
py -%PIPX_PYTHON_VERSION% -m pipx install --python py %PIPX_FLAGS% ^
30+
pipx install %PIPX_FLAGS% ^
2831
"https://github.com/googleapis/storage-testbench/archive/%GCS_TESTBENCH_VERSION%.tar.gz" ^
2932
|| exit /B 1
3033

31-
py -%PIPX_PYTHON_VERSION% -m pipx list --verbose
34+
pipx list --verbose

0 commit comments

Comments
 (0)