From c57b1df5ecaa0a1340b7843e4fb5abb3c86a2277 Mon Sep 17 00:00:00 2001 From: Ruben DI BATTISTA Date: Thu, 13 Jul 2023 17:39:11 +0200 Subject: [PATCH] When repairing a pure python wheel, exit code should be 0 --- src/auditwheel/main_addtag.py | 2 +- src/auditwheel/main_repair.py | 2 +- src/auditwheel/main_show.py | 2 +- tests/integration/test_manylinux.py | 4 ++-- tests/integration/test_nonplatform_wheel.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/auditwheel/main_addtag.py b/src/auditwheel/main_addtag.py index 271d0866..6c9fc26d 100644 --- a/src/auditwheel/main_addtag.py +++ b/src/auditwheel/main_addtag.py @@ -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(".") diff --git a/src/auditwheel/main_repair.py b/src/auditwheel/main_repair.py index b1d9f878..d9b29a53 100644 --- a/src/auditwheel/main_repair.py +++ b/src/auditwheel/main_repair.py @@ -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"] diff --git a/src/auditwheel/main_show.py b/src/auditwheel/main_show.py index e3fe9a1a..48cf20f1 100644 --- a/src/auditwheel/main_show.py +++ b/src/auditwheel/main_show.py @@ -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() diff --git a/tests/integration/test_manylinux.py b/tests/integration/test_manylinux.py index 97e78874..84a1fbbb 100644 --- a/tests/integration/test_manylinux.py +++ b/tests/integration/test_manylinux.py @@ -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 diff --git a/tests/integration/test_nonplatform_wheel.py b/tests/integration/test_nonplatform_wheel.py index 817d084e..d0a62cea 100644 --- a/tests/integration/test_nonplatform_wheel.py +++ b/tests/integration/test_nonplatform_wheel.py @@ -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