From 382fb5e971529ff28e1b445a0d8475fbe6bf11fa Mon Sep 17 00:00:00 2001 From: YimingWu Date: Thu, 10 Oct 2024 19:13:23 +0800 Subject: [PATCH] Fix #128838: Extension: Support `_universal2` suffix for Mac Some python wheels can have `_universal2` suffixes which are built for both intel and arm architectures. This fix takes care of that. --- scripts/addons_core/bl_pkg/bl_extension_ops.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/addons_core/bl_pkg/bl_extension_ops.py b/scripts/addons_core/bl_pkg/bl_extension_ops.py index f3d7d2bc7b5..9124cb1a831 100644 --- a/scripts/addons_core/bl_pkg/bl_extension_ops.py +++ b/scripts/addons_core/bl_pkg/bl_extension_ops.py @@ -951,7 +951,8 @@ def _extensions_wheel_filter_for_platform(wheels): # FIXME: `macosx_11.00` should be `macosx_11_0`. platform_tag.startswith("macosx_") and # Ignore the MACOSX version, ensure `arm64` suffix. - platform_tag.endswith("_" + platform_tag_current.rpartition("_")[2]) + (platform_tag.endswith("_" + platform_tag_current.rpartition("_")[2]) or + platform_tag.endswith("_universal2")) ): pass elif platform_tag_current.startswith("linux_") and (