Skip to content

Commit 1665598

Browse files
committed
fixup
1 parent 1bd87e7 commit 1665598

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

tests/config_settings/construct_config_settings_tests.bzl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _test_minor_version_matching(name):
4747
}
4848
minor_cpu_matches = {
4949
str(Label(":is_python_3.11_aarch64")): "matched-3.11-aarch64",
50-
str(Label(":is_python_3.11_ppc")): "matched-3.11-ppc",
50+
str(Label(":is_python_3.11_ppc64le")): "matched-3.11-ppc64le",
5151
str(Label(":is_python_3.11_s390x")): "matched-3.11-s390x",
5252
str(Label(":is_python_3.11_x86_64")): "matched-3.11-x86_64",
5353
}
@@ -58,7 +58,7 @@ def _test_minor_version_matching(name):
5858
}
5959
minor_os_cpu_matches = {
6060
str(Label(":is_python_3.11_linux_aarch64")): "matched-3.11-linux-aarch64",
61-
str(Label(":is_python_3.11_linux_ppc")): "matched-3.11-linux-ppc",
61+
str(Label(":is_python_3.11_linux_ppc64le")): "matched-3.11-linux-ppc64le",
6262
str(Label(":is_python_3.11_linux_s390x")): "matched-3.11-linux-s390x",
6363
str(Label(":is_python_3.11_linux_x86_64")): "matched-3.11-linux-x86_64",
6464
str(Label(":is_python_3.11_osx_aarch64")): "matched-3.11-osx-aarch64",
@@ -171,7 +171,7 @@ def construct_config_settings_test_suite(name): # buildifier: disable=function-
171171
},
172172
)
173173

174-
for cpu in ["s390x", "ppc", "x86_64", "aarch64"]:
174+
for cpu in ["s390x", "ppc", "ppc64le", "x86_64", "aarch64"]:
175175
native.config_setting(
176176
name = "is_python_3.11_" + cpu,
177177
constraint_values = [
@@ -185,6 +185,7 @@ def construct_config_settings_test_suite(name): # buildifier: disable=function-
185185
for (os, cpu) in [
186186
("linux", "aarch64"),
187187
("linux", "ppc"),
188+
("linux", "ppc64le"),
188189
("linux", "s390x"),
189190
("linux", "x86_64"),
190191
("osx", "aarch64"),

tests/pypi/whl_installer/platform_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ def test_linux_specializations(self):
8484
Platform(os=OS.linux, arch=Arch.x86_32),
8585
Platform(os=OS.linux, arch=Arch.aarch64),
8686
Platform(os=OS.linux, arch=Arch.ppc),
87+
Platform(os=OS.linux, arch=Arch.ppc64le),
8788
Platform(os=OS.linux, arch=Arch.s390x),
8889
Platform(os=OS.linux, arch=Arch.arm),
8990
]

tests/pypi/whl_library_targets/whl_library_targets_tests.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _test_platforms(env):
6868
"@//python/config_settings:is_python_3.9": ["py39_dep"],
6969
"@platforms//cpu:aarch64": ["arm_dep"],
7070
"@platforms//os:windows": ["win_dep"],
71-
"cp310_linux_ppc": ["py310_linux_ppc_dep"],
71+
"cp310_linux_ppc64le": ["py310_linux_ppc64le_dep"],
7272
"cp39_anyos_aarch64": ["py39_arm_dep"],
7373
"cp39_linux_anyarch": ["py39_linux_dep"],
7474
"linux_x86_64": ["linux_intel_dep"],
@@ -82,12 +82,12 @@ def _test_platforms(env):
8282

8383
env.expect.that_collection(calls).contains_exactly([
8484
{
85-
"name": "is_python_3.10_linux_ppc",
85+
"name": "is_python_3.10_linux_ppc64le",
8686
"flag_values": {
8787
"@rules_python//python/config_settings:python_version_major_minor": "3.10",
8888
},
8989
"constraint_values": [
90-
"@platforms//cpu:ppc",
90+
"@platforms//cpu:ppc64le",
9191
"@platforms//os:linux",
9292
],
9393
"visibility": ["//visibility:private"],
@@ -195,7 +195,7 @@ def _test_whl_and_library_deps(env):
195195
"@//python/config_settings:is_python_3.9": ["py39_dep"],
196196
"@platforms//cpu:aarch64": ["arm_dep"],
197197
"@platforms//os:windows": ["win_dep"],
198-
"cp310_linux_ppc": ["py310_linux_ppc_dep"],
198+
"cp310_linux_ppc64le": ["py310_linux_ppc64le_dep"],
199199
"cp39_anyos_aarch64": ["py39_arm_dep"],
200200
"cp39_linux_anyarch": ["py39_linux_dep"],
201201
"linux_x86_64": ["linux_intel_dep"],
@@ -227,7 +227,7 @@ def _test_whl_and_library_deps(env):
227227
Label("//python/config_settings:is_python_3.9"): ["@pypi_py39_dep//:whl"],
228228
"@platforms//cpu:aarch64": ["@pypi_arm_dep//:whl"],
229229
"@platforms//os:windows": ["@pypi_win_dep//:whl"],
230-
":is_python_3.10_linux_ppc": ["@pypi_py310_linux_ppc_dep//:whl"],
230+
":is_python_3.10_linux_ppc64le": ["@pypi_py310_linux_ppc64le_dep//:whl"],
231231
":is_python_3.9_anyos_aarch64": ["@pypi_py39_arm_dep//:whl"],
232232
":is_python_3.9_linux_anyarch": ["@pypi_py39_linux_dep//:whl"],
233233
":is_linux_x86_64": ["@pypi_linux_intel_dep//:whl"],
@@ -264,7 +264,7 @@ def _test_whl_and_library_deps(env):
264264
Label("//python/config_settings:is_python_3.9"): ["@pypi_py39_dep//:pkg"],
265265
"@platforms//cpu:aarch64": ["@pypi_arm_dep//:pkg"],
266266
"@platforms//os:windows": ["@pypi_win_dep//:pkg"],
267-
":is_python_3.10_linux_ppc": ["@pypi_py310_linux_ppc_dep//:pkg"],
267+
":is_python_3.10_linux_ppc64le": ["@pypi_py310_linux_ppc64le_dep//:pkg"],
268268
":is_python_3.9_anyos_aarch64": ["@pypi_py39_arm_dep//:pkg"],
269269
":is_python_3.9_linux_anyarch": ["@pypi_py39_linux_dep//:pkg"],
270270
":is_linux_x86_64": ["@pypi_linux_intel_dep//:pkg"],

tests/pypi/whl_target_platforms/whl_target_platforms_tests.bzl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def _test_simple(env):
3232
struct(os = "linux", cpu = "x86_32", abi = None, target_platform = "linux_x86_32", version = (2, 17)),
3333
],
3434
"musllinux_1_1_ppc64le": [
35-
struct(os = "linux", cpu = "ppc", abi = None, target_platform = "linux_ppc", version = (1, 1)),
35+
struct(os = "linux", cpu = "ppc64le", abi = None, target_platform = "linux_ppc64le", version = (1, 1)),
3636
],
3737
"win_amd64": [
3838
struct(os = "windows", cpu = "x86_64", abi = None, target_platform = "windows_x86_64", version = (0, 0)),
@@ -60,9 +60,12 @@ def _test_with_abi(env):
6060
"manylinux1_i686.manylinux_2_17_i686": [
6161
struct(os = "linux", cpu = "x86_32", abi = "cp38", target_platform = "cp38_linux_x86_32", version = (0, 0)),
6262
],
63-
"musllinux_1_1_ppc64le": [
63+
"musllinux_1_1_ppc64": [
6464
struct(os = "linux", cpu = "ppc", abi = "cp311", target_platform = "cp311_linux_ppc", version = (1, 1)),
6565
],
66+
"musllinux_1_1_ppc64le": [
67+
struct(os = "linux", cpu = "ppc64le", abi = "cp311", target_platform = "cp311_linux_ppc64le", version = (1, 1)),
68+
],
6669
"win_amd64": [
6770
struct(os = "windows", cpu = "x86_64", abi = "cp311", target_platform = "cp311_windows_x86_64", version = (0, 0)),
6871
],

0 commit comments

Comments
 (0)