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

When repairing a pure python wheel, exit code should be 0 #438

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion src/auditwheel/main_addtag.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def execute(args, p):
wheel_abi = analyze_wheel_abi(args.WHEEL_FILE)
except NonPlatformWheel:
logger.info(NonPlatformWheel.LOG_MESSAGE)
return 1
return 0

parsed_fname = WHEEL_INFO_RE.search(basename(args.WHEEL_FILE))
in_fname_tags = parsed_fname.groupdict()["plat"].split(".")
Expand Down
2 changes: 1 addition & 1 deletion src/auditwheel/main_repair.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def execute(args, p):
wheel_abi = analyze_wheel_abi(wheel_file)
except NonPlatformWheel:
logger.info(NonPlatformWheel.LOG_MESSAGE)
return 1
return 0

policy = get_policy_by_name(args.PLAT)
reqd_tag = policy["priority"]
Expand Down
2 changes: 1 addition & 1 deletion src/auditwheel/main_show.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def execute(args, p):
winfo = analyze_wheel_abi(args.WHEEL_FILE)
except NonPlatformWheel:
logger.info(NonPlatformWheel.LOG_MESSAGE)
return 1
return 0

libs_with_versions = [
f"{k} with versions {v}" for k, v in winfo.versioned_symbols.items()
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_manylinux.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,11 @@ def test_build_repair_pure_wheel(self, any_manylinux_container, io_folder):

# Repair the wheel using the manylinux container
repair_command = f"auditwheel repair --plat {policy} -w /io /io/{orig_wheel}"
output = docker_exec(manylinux_ctr, repair_command, expected_retcode=1)
output = docker_exec(manylinux_ctr, repair_command, expected_retcode=0)
assert "This does not look like a platform wheel" in output

output = docker_exec(
manylinux_ctr, f"auditwheel show /io/{orig_wheel}", expected_retcode=1
manylinux_ctr, f"auditwheel show /io/{orig_wheel}", expected_retcode=0
)
assert "This does not look like a platform wheel" in output

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_nonplatform_wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ def test_non_platform_wheel_repair(mode):
stderr=subprocess.PIPE,
text=True,
)
assert proc.returncode == 1
assert proc.returncode == 0
assert "This does not look like a platform wheel" in proc.stderr
assert "AttributeError" not in proc.stderr