From a79f0ef95ea341c1d43f6674b04e4ee9cc4271b3 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 30 Jan 2021 17:22:26 +0000 Subject: [PATCH] Remove wheel rename hack --- cibuildwheel/macos.py | 10 ---------- test/utils.py | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index a5425172..0498f7f8 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -367,16 +367,6 @@ def build(options: BuildOptions) -> None: repaired_wheel = next(repaired_wheel_dir.glob('*.whl')) - if repaired_wheel.stem.endswith('_universal2'): - # due to a bug in packaging/tags, this universal wheel isn't - # installable on arm64. so we rename it to add a 11_0 platform - # tag. - # See https://github.com/pypa/packaging/pull/380 and - # https://github.com/pypa/packaging/issues/379 - renamed_wheel = repaired_wheel.parent / f'{repaired_wheel.stem}.macosx_11_0_universal2.whl' - repaired_wheel.rename(renamed_wheel) - repaired_wheel = renamed_wheel - log.step_end() if options.test_command and options.test_selector(config.identifier): diff --git a/test/utils.py b/test/utils.py index f9d906c9..8dcb2f60 100644 --- a/test/utils.py +++ b/test/utils.py @@ -152,7 +152,7 @@ def expected_wheels(package_name, package_version, manylinux_versions=None, if python_abi_tag == 'cp39-cp39' and machine_arch == 'arm64': arm64_macosx_deployment_target = _get_arm64_macosx_deployment_target(macosx_deployment_target) platform_tags = [ - f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2.macosx_{arm64_macosx_deployment_target.replace(".", "_")}_universal2', + f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2', f'macosx_{arm64_macosx_deployment_target.replace(".", "_")}_arm64', ] else: