From 42efc40b0acf3027093a22da2c75ded0f815d71c Mon Sep 17 00:00:00 2001 From: Tim Felgentreff Date: Fri, 30 Jun 2023 17:40:18 +0200 Subject: [PATCH] fix expected graalpy wheel names for tests --- test/utils.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/utils.py b/test/utils.py index 0ebfe28bb..4bd90247a 100644 --- a/test/utils.py +++ b/test/utils.py @@ -182,12 +182,14 @@ def expected_wheels( ] # GraalPy encodes compilation platform and arch in the tag - if machine_arch == "x86_64" and platform == "linux": - python_abi_tags += ["graalpy230_310_native_x86_64_linux"] - elif machine_arch == "aarch64" and platform == "linux": + if machine_arch in ["x86_64", "AMD64"]: + if platform == "linux": + python_abi_tags += ["graalpy230_310_native_x86_64_linux"] + elif platform == "macos": + python_abi_tags += ["graalpy230_310_native_x86_64_darwin"] + + if machine_arch == "aarch64" and platform == "linux": python_abi_tags += ["graalpy230_310_native_aarch64_linux"] - elif machine_arch == "AMD64" and platform == "macos": - python_abi_tags += ["graalpy230_310_native_x86_64_darwin"] if platform == "macos" and machine_arch == "arm64": # arm64 macs are only supported by cp38+ @@ -211,7 +213,7 @@ def expected_wheels( if platform == "linux": architectures = [arch_name_for_linux(machine_arch)] - if machine_arch == "x86_64": + if machine_arch == "x86_64" and not python_abi_tag.startswith("graalpy"): architectures.append("i686") platform_tags = [ @@ -221,7 +223,7 @@ def expected_wheels( ) for architecture in architectures ] - if len(musllinux_versions) > 0 and not python_abi_tag.startswith("pp"): + if len(musllinux_versions) > 0 and not python_abi_tag.startswith(("pp", "graalpy")): platform_tags.extend( [ ".".join(