Skip to content

Commit 596f8f3

Browse files
committed
Merge branch 'main' into 2027
2 parents 1be8560 + 3d94355 commit 596f8f3

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

devtools/subproject.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@ def is_meson_project(self) -> bool:
5050

5151
def develop(self):
5252
self.ctx.run_pip(
53-
"install", "-v", "-e", ".", "--no-build-isolation", cwd=self.path
53+
"install",
54+
"-v",
55+
"-e",
56+
".",
57+
"--no-build-isolation",
58+
"--config-settings=setup-args=-Dbuildtype=debug",
59+
cwd=self.path,
5460
)
5561

5662
def uninstall(self):
@@ -177,23 +183,30 @@ def _fix_wheel_name(self, wheel_path: pathlib.Path) -> str:
177183
def _fix_linux_wheel_name(self, wheel_path: pathlib.Path) -> str:
178184
# inspired by https://github.com/hsorby/renamewheel, Apache license
179185

180-
from auditwheel.error import NonPlatformWheel, WheelToolsError
186+
from auditwheel.error import AuditwheelError
181187
from auditwheel.wheel_abi import analyze_wheel_abi
182188
from auditwheel.wheeltools import get_wheel_architecture, get_wheel_libc
183189

184190
try:
185191
arch = get_wheel_architecture(wheel_path.name)
186-
except (WheelToolsError, NonPlatformWheel):
192+
except AuditwheelError:
187193
arch = None
188194

189195
try:
190196
libc = get_wheel_libc(wheel_path.name)
191-
except WheelToolsError:
197+
except AuditwheelError:
192198
libc = None
193199

194200
try:
195-
winfo = analyze_wheel_abi(libc, arch, wheel_path, frozenset(), True, True)
196-
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:
197210
return wheel_path.name
198211
else:
199212
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)