Skip to content

Commit ab43cbb

Browse files
committed
fix expected graalpy wheel names for tests
1 parent c5abafb commit ab43cbb

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

test/utils.py

+13-10
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,16 @@ def expected_wheels(
181181
"pp310-pypy310_pp73",
182182
]
183183

184-
# GraalPy encodes compilation platform and arch in the tag
185-
if machine_arch == "x86_64" and platform == "linux":
186-
python_abi_tags += ["graalpy230_310_native_x86_64_linux"]
187-
elif machine_arch == "aarch64" and platform == "linux":
188-
python_abi_tags += ["graalpy230_310_native_aarch64_linux"]
189-
elif machine_arch == "AMD64" and platform == "macos":
190-
python_abi_tags += ["graalpy230_310_native_x86_64_darwin"]
184+
# GraalPy encodes compilation platform and arch in the tag, because it
185+
# can execute native extensions compiled for different platforms
186+
if machine_arch in ["x86_64", "AMD64"]:
187+
if platform == "linux":
188+
python_abi_tags += ["graalpy310-graalpy230_310_native_x86_64_linux-linux_i686"]
189+
elif platform == "macos":
190+
python_abi_tags += ["graalpy310-graalpy230_310_native_x86_64_darwin-darwin_i686"]
191+
192+
if machine_arch == "aarch64" and platform == "linux":
193+
python_abi_tags += ["graalpy310-graalpy230_310_native_aarch64_linux-linux-aarch64"]
191194

192195
if platform == "macos" and machine_arch == "arm64":
193196
# arm64 macs are only supported by cp38+
@@ -200,7 +203,7 @@ def expected_wheels(
200203
"pp38-pypy38_pp73",
201204
"pp39-pypy39_pp73",
202205
"pp310-pypy310_pp73",
203-
"graalpy230_310_native_aarch64_darwin",
206+
"graalpy310-graalpy230_310_native_x86_64_linux-linux_i686",
204207
]
205208

206209
wheels = []
@@ -211,7 +214,7 @@ def expected_wheels(
211214
if platform == "linux":
212215
architectures = [arch_name_for_linux(machine_arch)]
213216

214-
if machine_arch == "x86_64":
217+
if machine_arch == "x86_64" and not python_abi_tag.startswith("graalpy"):
215218
architectures.append("i686")
216219

217220
platform_tags = [
@@ -221,7 +224,7 @@ def expected_wheels(
221224
)
222225
for architecture in architectures
223226
]
224-
if len(musllinux_versions) > 0 and not python_abi_tag.startswith("pp"):
227+
if len(musllinux_versions) > 0 and not python_abi_tag.startswith(("pp", "graalpy")):
225228
platform_tags.extend(
226229
[
227230
".".join(

0 commit comments

Comments
 (0)