Skip to content

Commit be4c950

Browse files
authored
setup.py -> eliminate delvewheel mangling and simplify try_unmangle (#26)
1 parent 25ab547 commit be4c950

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ def repair_wheel_windows(lib_path, whl, out_dir):
248248
"-m",
249249
"delvewheel",
250250
"repair",
251+
"-vv",
252+
"--no-mangle-all",
251253
f"--wheel-dir={out_dir}",
252254
whl,
253255
]
@@ -346,10 +348,6 @@ def write_licenses(prefix, whl, always_pkgs, added_files, out):
346348

347349

348350
def try_unmangle(n):
349-
# delvewheel mangling example: "vtkCommonColor-9.0.dll" => "vtkCommonColor-9.0-87ee4902.dll"
350-
m = re.match("^(.+)-[0-9A-Fa-f]{8,}([.]dll)$", n)
351-
if m:
352-
return m.group(1) + m.group(2)
353351
# auditwheel mangling example: "libvtkCommonColor-9.0.so.9.0.1" => "libvtkCommonColor-9-9810eeb7.0.so.9.0.1"
354352
m = re.match("^([^.]+)-[0-9A-Fa-f]{8,}([.].+)$", n)
355353
if m:

0 commit comments

Comments
 (0)