Skip to content

Commit 3d94355

Browse files
authored
Merge pull request #218 from robotpy/fix-auditwheel
Update to auditwheel 6.5.1
2 parents 0d7f29b + ad17091 commit 3d94355

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

devtools/subproject.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,23 +183,30 @@ def _fix_wheel_name(self, wheel_path: pathlib.Path) -> str:
183183
def _fix_linux_wheel_name(self, wheel_path: pathlib.Path) -> str:
184184
# inspired by https://github.com/hsorby/renamewheel, Apache license
185185

186-
from auditwheel.error import NonPlatformWheel, WheelToolsError
186+
from auditwheel.error import AuditwheelError
187187
from auditwheel.wheel_abi import analyze_wheel_abi
188188
from auditwheel.wheeltools import get_wheel_architecture, get_wheel_libc
189189

190190
try:
191191
arch = get_wheel_architecture(wheel_path.name)
192-
except (WheelToolsError, NonPlatformWheel):
192+
except AuditwheelError:
193193
arch = None
194194

195195
try:
196196
libc = get_wheel_libc(wheel_path.name)
197-
except WheelToolsError:
197+
except AuditwheelError:
198198
libc = None
199199

200200
try:
201-
winfo = analyze_wheel_abi(libc, arch, wheel_path, frozenset(), True, True)
202-
except NonPlatformWheel:
201+
winfo = analyze_wheel_abi(
202+
libc,
203+
arch,
204+
wheel_path,
205+
frozenset(),
206+
disable_isa_ext_check=True,
207+
allow_graft=True,
208+
)
209+
except AuditwheelError:
203210
return wheel_path.name
204211
else:
205212
parts = wheel_path.name.split("-")

rdev_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ validobj~=1.2
1111
ninja
1212
msvc-runtime>=14.42.34433; platform_system == 'Windows'
1313

14-
auditwheel~=6.4; platform_system == 'Linux'
14+
auditwheel~=6.5.1; platform_system == 'Linux'

0 commit comments

Comments
 (0)