Try to fix more issues

apache · Dec 18, 2024 · 0d30b99 · 0d30b99
1 parent dc04f25
commit 0d30b99
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/ci/docker/python-free-threaded-wheel-windows-test-vs2019.dockerfile b/ci/docker/python-free-threaded-wheel-windows-test-vs2019.dockerfile
@@ -24,8 +24,8 @@ ARG base
 FROM ${base}
 
 SHELL ["powershell", "-NoProfile", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-RUN $filename = 'python-3.13.0-amd64.exe'; \
-    $url = 'https://www.python.org/ftp/python/3.13.0/' + $filename; \
+RUN $filename = 'python-3.13.1-amd64.exe'; \
+    $url = 'https://www.python.org/ftp/python/3.13.1/' + $filename; \
     Invoke-WebRequest -Uri $url -OutFile $filename; \
     Start-Process -FilePath $filename -ArgumentList '/quiet', 'Include_freethreaded=1' -Wait
 

diff --git a/ci/docker/python-wheel-windows-test-vs2019.dockerfile b/ci/docker/python-wheel-windows-test-vs2019.dockerfile
@@ -20,9 +20,8 @@
 
 # based on mcr.microsoft.com/windows/servercore:ltsc2019
 # contains choco and vs2019 preinstalled
-ARG repo
-ARG tag
-FROM ${repo}:${tag}
+ARG base
+FROM ${base}
 
 # hadolint shell=cmd.exe
 

diff --git a/ci/scripts/python_wheel_windows_test.bat b/ci/scripts/python_wheel_windows_test.bat
@@ -47,10 +47,12 @@ set PYTHON_CMD=py -%PYTHON%
 @REM Install testing dependencies
 if "%PYTHON%"=="3.13t" (
     %PYTHON_CMD% -m pip install ^
-    --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple ^
-    --pre ^
-    --prefer-binary ^
-    -r C:\arrow\python\requirements-wheel-test.txt || exit /B 1
+        --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple ^
+        --pre ^
+        --prefer-binary ^
+        -r C:\arrow\python\requirements-wheel-test.txt || exit /B 1
+    @REM Avoid crash when importing cffi from test_cffi
+    %PYTHON_CMD% -m pip uninstall cffi || exit /B 1
 ) ELSE (
     %PYTHON_CMD% -m pip install -r C:\arrow\python\requirements-wheel-test.txt || exit /B 1
 )

diff --git a/dev/tasks/python-wheels/github.windows.yml b/dev/tasks/python-wheels/github.windows.yml
@@ -60,7 +60,6 @@ jobs:
           if errorlevel 1 (
             archery docker build --no-pull python-wheel-windows-vs2019 || exit /B 1
           )
-          archery docker push python-wheel-windows-vs2019
           archery docker run --no-build -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }} python-wheel-windows-vs2019
 
       - name: Build free-threaded wheel

diff --git a/python/setup.py b/python/setup.py
@@ -223,7 +223,6 @@ def initialize_options(self):
         '_hdfs',
         'gandiva']
 
-
     def _run_cmake(self):
         # check if build_type is correctly passed / set
         if self.build_type.lower() not in ('release', 'debug',