Skip to content

Commit

Permalink
Fix cffi uninstall step
Browse files Browse the repository at this point in the history
  • Loading branch information
pitrou committed Dec 19, 2024
1 parent 3f34995 commit 55e4cc0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ci/scripts/python_wheel_windows_test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if "%PYTHON%"=="3.13t" (
--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
%PYTHON_CMD% -m pip uninstall -y cffi || exit /B 1
) ELSE (
%PYTHON_CMD% -m pip install -r C:\arrow\python\requirements-wheel-test.txt || exit /B 1
)
Expand Down
14 changes: 13 additions & 1 deletion dev/tasks/python-wheels/github.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
@rem We can remove this workaround once we find a way to use
@rem pulled caches when build an image.
echo on
archery docker pull --no-ignore-pull-failures python-wheel-windows-vs2019-base
archery docker pull --no-ignore-pull-failures python-wheel-windows-vs2019
if errorlevel 1 (
archery docker build --no-pull python-wheel-windows-vs2019 || exit /B 1
Expand All @@ -75,6 +76,7 @@ jobs:
@rem We can remove this workaround once we find a way to use
@rem pulled caches when build an image.
echo on
archery docker pull --no-ignore-pull-failures python-wheel-windows-vs2019-base
archery docker pull --no-ignore-pull-failures python-free-threaded-wheel-windows-vs2019
if errorlevel 1 (
archery docker build --no-pull python-free-threaded-wheel-windows-vs2019 || exit /B 1
Expand Down Expand Up @@ -107,7 +109,17 @@ jobs:
{{ macros.github_upload_wheel_scientific_python("arrow/python/dist/*.whl")|indent }}

{% if arrow.is_default_branch() %}
- name: Push Docker Image
- name: Push Docker image
if: |
'{{ python_abi_tag }}' != 'cp313t'
shell: cmd
run: |
cd arrow
archery docker push python-wheel-windows-vs2019
- name: Push free-threaded Docker image
if: |
'{{ python_abi_tag }}' == 'cp313t'
shell: cmd
run: |
cd arrow
Expand Down

0 comments on commit 55e4cc0

Please sign in to comment.