Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-45278: [Python][Packaging] Updated delvewheel install command and updated flags used with delvewheel repair #45323

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+3 −9
Open

GH-45278: [Python][Packaging] Updated delvewheel install command and updated flags used with delvewheel repair #45323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9308397
Updated delvewheel install command and updated flags used with delvew…
protokoul Jan 21, 2025
d7c2e48
Removed arguments from --with-mangle flag
protokoul Jan 21, 2025
4135fb9
Removed the line to copy msvcp40.dll to the wheel
protokoul Jan 21, 2025
657d971
allow pyarrow.libs folder in windows wheel
protokoul Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/scripts/python_wheel_validate_contents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def validate_wheel(path):
f = zipfile.ZipFile(wheels[0])
outliers = [
info.filename for info in f.filelist if not re.match(
r'(pyarrow/|pyarrow-[-.\w\d]+\.dist-info/)', info.filename
r'(pyarrow/|pyarrow-[-.\w\d]+\.dist-info/|pyarrow\.libs/)', info.filename
)
]
assert not outliers, f"Unexpected contents in wheel: {sorted(outliers)}"
Expand Down
10 changes: 2 additions & 8 deletions ci/scripts/python_wheel_windows_build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ set CMAKE_PREFIX_PATH=C:\arrow-dist

pushd C:\arrow\python

@REM Bundle the C++ runtime
cp C:\Windows\System32\msvcp140.dll pyarrow\

@REM Build wheel
%PYTHON_CMD% setup.py bdist_wheel || exit /B 1

Expand All @@ -144,16 +141,13 @@ cp C:\Windows\System32\msvcp140.dll pyarrow\
@REM Since we bundled the Arrow C++ libraries ourselves, we only need to
@REM mangle msvcp140.dll so as to avoid ABI issues when msvcp140.dll is
@REM required by multiple Python libraries in the same process.
@REM
@REM For now this requires a custom version of delvewheel:
@REM https://github.com/adang1345/delvewheel/pull/59
%PYTHON_CMD% -m pip install https://github.com/pitrou/delvewheel/archive/refs/heads/fixes-for-arrow.zip || exit /B 1
%PYTHON_CMD% -m pip install delvewheel || exit /B 1

for /f %%i in ('dir dist\pyarrow-*.whl /B') do (set WHEEL_NAME=%cd%\dist\%%i) || exit /B 1
echo "Wheel name: %WHEEL_NAME%"

%PYTHON_CMD% -m delvewheel repair -vv ^
--mangle-only=msvcp140.dll --no-patch ^
--ignore-existing --with-mangle ^
-w repaired_wheels %WHEEL_NAME% || exit /B 1

popd
Loading