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.

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

Add ability to pass wildcard arguments to --exclude #508

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 2 additions & 1 deletion src/auditwheel/lddtree.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import glob
import logging
import os
from fnmatch import fnmatch
from pathlib import Path
from typing import Any

Expand Down Expand Up @@ -405,7 +406,7 @@ def lddtree(
elif t.entry.d_tag == "DT_RUNPATH":
runpaths = parse_ld_paths(t.runpath, path=path, root=root)
elif t.entry.d_tag == "DT_NEEDED":
if t.needed in exclude:
if any(fnmatch(t.needed, e) for e in exclude):
log.info(f"Excluding {t.needed}")
else:
libs.append(t.needed)
Expand Down
3 changes: 2 additions & 1 deletion src/auditwheel/main_repair.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ def configure_parser(sub_parsers):
"--exclude",
dest="EXCLUDE",
help="Exclude SONAME from grafting into the resulting wheel "
"(can be specified multiple times)",
"(can be specified multiple times) "
"(can contain wildcards, for example libfoo.so.*)",
action="append",
default=[],
)
Expand Down
3 changes: 2 additions & 1 deletion src/auditwheel/repair.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import re
import shutil
import stat
from fnmatch import fnmatch
from os.path import abspath, basename, dirname, exists, isabs
from os.path import join as pjoin
from pathlib import Path
Expand Down Expand Up @@ -70,7 +71,7 @@ def repair_wheel(
ext_libs: dict[str, str] = v[abis[0]]["libs"]
replacements: list[tuple[str, str]] = []
for soname, src_path in ext_libs.items():
assert soname not in exclude
assert not any(fnmatch(soname, e) for e in exclude)

if src_path is None:
raise ValueError(
Expand Down
7 changes: 7 additions & 0 deletions tests/integration/test_bundled_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
[
("cffi-1.5.0-cp27-none-linux_x86_64.whl", {"libffi.so.5"}, frozenset()),
("cffi-1.5.0-cp27-none-linux_x86_64.whl", set(), frozenset(["libffi.so.5"])),
(
"cffi-1.5.0-cp27-none-linux_x86_64.whl",
{"libffi.so.5"},
frozenset(["libffi.so.noexist", "libnoexist.so.*"]),
),
("cffi-1.5.0-cp27-none-linux_x86_64.whl", set(), frozenset(["libffi.so.*"])),
("cffi-1.5.0-cp27-none-linux_x86_64.whl", set(), frozenset(["*"])),
(
"python_snappy-0.5.2-pp260-pypy_41-linux_x86_64.whl",
{"libsnappy.so.1"},
Expand Down