Skip to content

Commit 4a2188a

Browse files
author
Simon Rit
committed
BUG: Fix deprecated use of auditwheel policies with exlcude option
cf8c3f3 introduced an option to exclude libraries from the wheel using auditwheel lib_whitelist policy. This is deprecated since pypa/auditwheel@4886850. This patch uses the --exclude option instead, see pypa/auditwheel@0a2fdd1.
1 parent 80c77b9 commit 4a2188a

File tree

2 files changed

+6
-37
lines changed

2 files changed

+6
-37
lines changed

scripts/internal/auditwheel_whitelist_monkeypatch.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

scripts/internal/manylinux-build-module-wheels.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,14 @@ for PYBIN in "${PYBINARIES[@]}"; do
122122
|| exit 1
123123
done
124124

125-
# Make sure auditwheel is installed for this python exe before importing
126-
# it in auditwheel_whitelist_monkeypatch.py
125+
# Convert list of excluded libs in --exclude_libs to auditwheel --exclude options
126+
if test -n "$EXCLUDE_LIBS"; then
127+
AUDITWHEEL_EXCLUDE_ARGS="--exclude ${EXCLUDE_LIBS//;/ --exclude }"
128+
fi
129+
127130
sudo ${Python3_EXECUTABLE} -m pip install auditwheel
128131
for whl in dist/*linux*$(uname -m).whl; do
129-
# Repair wheel using monkey patch to exclude shared libraries provided in whitelist
130-
${Python3_EXECUTABLE} "${script_dir}/auditwheel_whitelist_monkeypatch.py" \
131-
repair ${whl} -w /work/dist/ --whitelist "${EXCLUDE_LIBS}"
132+
auditwheel repair ${whl} -w /work/dist/ ${AUDITWHEEL_EXCLUDE_ARGS}
132133
rm ${whl}
133134
done
134135

0 commit comments

Comments
 (0)