Skip to content

Commit f50d6f9

Browse files
committed
finish fixing the test
1 parent ce86558 commit f50d6f9

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pip = use_extension("//python/extensions:pip.bzl", "pip")
7979
"cp{major}{minor}",
8080
],
8181
whl_platform_tags = [
82-
"linux_*_{}".format(cpu),
82+
"linux_{}".format(cpu),
8383
"manylinux_*_{}".format(cpu),
8484
],
8585
)

python/private/pypi/select_whl.bzl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ _ANDROID = "android"
88
_ANY = "any"
99
_IOS = "ios"
1010
_MANYLINUX = "manylinux"
11+
_MACOSX = "macosx"
1112
_MUSLLINUX = "musllinux"
1213

1314
def _value_priority(*, tag, values):
@@ -27,10 +28,11 @@ def _platform_tag_priority(*, tag, values):
2728
# https://packaging.python.org/en/latest/specifications/platform-compatibility-tags/
2829

2930
if not (
30-
tag.startswith(_MANYLINUX) or
31-
tag.startswith(_MUSLLINUX) or
3231
tag.startswith(_ANDROID) or
33-
tag.startswith(_IOS)
32+
tag.startswith(_IOS) or
33+
tag.startswith(_MACOSX) or
34+
tag.startswith(_MANYLINUX) or
35+
tag.startswith(_MUSLLINUX)
3436
):
3537
res = _value_priority(tag = tag, values = values)
3638
if res == None:

tests/pypi/extension/extension_tests.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ def _test_torch_experimental_index_url(env):
410410
whl_platform_tags = whl_platform_tags,
411411
)
412412
for (os, cpu), whl_platform_tags in {
413-
("linux", "x86_64"): ["linux_*_x86_64", "manylinux_*_x86_64"],
414-
("linux", "aarch64"): ["linux_*_aarch64", "manylinux_*_aarch64"],
413+
("linux", "x86_64"): ["linux_x86_64", "manylinux_*_x86_64"],
414+
("linux", "aarch64"): ["linux_aarch64", "manylinux_*_aarch64"],
415415
("osx", "aarch64"): ["macosx_*_arm64"],
416416
("windows", "x86_64"): ["win_amd64"],
417417
("windows", "aarch64"): ["win_arm64"], # this should be ignored

0 commit comments

Comments
 (0)