rename

aignas · aignas · commit 233ca9df4464 · 2025-07-07T22:03:44.000+09:00
diff --git a/.bazelrc b/.bazelrc
@@ -4,8 +4,8 @@
 # (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
 # To update these lines, execute
 # `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
-build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,rules_python-repro,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/another_module,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma,tests/modules/other/nspkg_single,tests/modules/other/simple_v1,tests/modules/other/simple_v2,tests/modules/other/with_external_data,tests/whl_with_build_files/testdata,tests/whl_with_build_files/testdata/somepkg,tests/whl_with_build_files/testdata/somepkg-1.0.dist-info,tests/whl_with_build_files/testdata/somepkg/subpkg
-query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,rules_python-repro,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/another_module,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma,tests/modules/other/nspkg_single,tests/modules/other/simple_v1,tests/modules/other/simple_v2,tests/modules/other/with_external_data,tests/whl_with_build_files/testdata,tests/whl_with_build_files/testdata/somepkg,tests/whl_with_build_files/testdata/somepkg-1.0.dist-info,tests/whl_with_build_files/testdata/somepkg/subpkg
+build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/another_module,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma,tests/modules/other/nspkg_single,tests/modules/other/simple_v1,tests/modules/other/simple_v2,tests/modules/other/with_external_data,tests/whl_with_build_files/testdata,tests/whl_with_build_files/testdata/somepkg,tests/whl_with_build_files/testdata/somepkg-1.0.dist-info,tests/whl_with_build_files/testdata/somepkg/subpkg
+query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/another_module,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma,tests/modules/other/nspkg_single,tests/modules/other/simple_v1,tests/modules/other/simple_v2,tests/modules/other/with_external_data,tests/whl_with_build_files/testdata,tests/whl_with_build_files/testdata/somepkg,tests/whl_with_build_files/testdata/somepkg-1.0.dist-info,tests/whl_with_build_files/testdata/somepkg/subpkg
 
 test --test_output=errors
 
diff --git a/examples/bzlmod/MODULE.bazel b/examples/bzlmod/MODULE.bazel
@@ -172,7 +172,7 @@ pip.default(
     os_name = "windows",
     platform = "windows_aarch64",
     platform_tags = ["win_amd64"],
-    want_abis = [],  # default to all ABIs
+    whl_abi_tags = [],  # default to all ABIs
 )
 
 # To fetch pip dependencies, use pip.parse. We can pass in various options,
diff --git a/python/private/pypi/extension.bzl b/python/private/pypi/extension.bzl
@@ -95,7 +95,7 @@ def _platforms(*, python_version, minor_mapping, config):
                 arch = values.arch_name,
                 python_version = python_version.string,
             ),
-            want_abis = [
+            whl_abi_tags = [
                 v.format(
                     major = python_version.release[0],
                     minor = python_version.release[1],
diff --git a/python/private/pypi/parse_requirements.bzl b/python/private/pypi/parse_requirements.bzl
@@ -419,7 +419,7 @@ def _add_dists(*, requirement, index_urls, target_platform, logger = None):
         whls = whls,
         python_version = target_platform.env["python_full_version"],
         implementation_name = target_platform.env["implementation_name"],
-        want_abis = target_platform.want_abis,
+        whl_abi_tags = target_platform.whl_abi_tags,
         platforms = target_platform.platform_tags,
         logger = logger,
     ) or sdist
diff --git a/python/private/pypi/select_whl.bzl b/python/private/pypi/select_whl.bzl
@@ -20,7 +20,7 @@ def _get_priority(*, tag, values, allow_wildcard = True):
 
     return None
 
-def select_whl(*, whls, python_version, platforms, want_abis, implementation_name = "cpython", limit = 1, logger = None):
+def select_whl(*, whls, python_version, platforms, whl_abi_tags, implementation_name = "cpython", limit = 1, logger = None):
     """Select a whl that is the most suitable for the given platform.
 
     Args:
@@ -30,7 +30,7 @@ def select_whl(*, whls, python_version, platforms, want_abis, implementation_nam
         platforms: {type}`list[str]` the target platform identifiers that may contain
             a single `*` character.
         implementation_name: {type}`str` the `implementation_name` from the target_platform env.
-        want_abis: {type}`str` the ABIs that the target_platform is compatible with.
+        whl_abi_tags: {type}`str` the ABIs that the target_platform is compatible with.
         limit: {type}`int` number of wheels to return. Defaults to 1.
         logger: {type}`struct` the logger instance.
 
@@ -76,14 +76,14 @@ def select_whl(*, whls, python_version, platforms, want_abis, implementation_nam
 
         abi_priority = _get_priority(
             tag = parsed.abi_tag,
-            values = want_abis,
+            values = whl_abi_tags,
             allow_wildcard = False,
         )
         if abi_priority == None:
             if logger:
                 logger.debug(lambda: "The abi '{}' does not match given list: {}".format(
                     parsed.abi_tag,
-                    want_abis,
+                    whl_abi_tags,
                 ))
             continue
         platform_priority = _get_priority(
diff --git a/tests/pypi/parse_requirements/parse_requirements_tests.bzl b/tests/pypi/parse_requirements/parse_requirements_tests.bzl
@@ -531,7 +531,7 @@ def _test_overlapping_shas_with_index_results(env):
                     os = "linux",
                     arch = "x86_64",
                 ),
-                want_abis = ["none"],
+                whl_abi_tags = ["none"],
             ),
             "cp39_osx_x86_64": struct(
                 platform_tags = ["macosx_*"],
@@ -540,7 +540,7 @@ def _test_overlapping_shas_with_index_results(env):
                     os = "osx",
                     arch = "x86_64",
                 ),
-                want_abis = ["none"],
+                whl_abi_tags = ["none"],
             ),
         },
         get_index_urls = lambda _, __: {
diff --git a/tests/pypi/select_whl/select_whl_tests.bzl b/tests/pypi/select_whl/select_whl_tests.bzl
@@ -106,7 +106,7 @@ def _test_simplest(env):
     got = _select_whl(
         whls = whls,
         platforms = ["any"],
-        want_abis = ["abi3"],
+        whl_abi_tags = ["abi3"],
         python_version = "3.0",
     )
     _match(
@@ -131,7 +131,7 @@ def _test_select_by_supported_py_version(env):
         got = _select_whl(
             whls = whls,
             platforms = ["any"],
-            want_abis = ["abi3"],
+            whl_abi_tags = ["abi3"],
             python_version = "3.{}".format(minor_version),
         )
         _match(env, [got], match)
@@ -153,7 +153,7 @@ def _test_select_by_supported_cp_version(env):
         got = _select_whl(
             whls = whls,
             platforms = ["any"],
-            want_abis = ["abi3"],
+            whl_abi_tags = ["abi3"],
             python_version = "3.{}".format(minor_version),
         )
         _match(env, [got], match)
@@ -175,7 +175,7 @@ def _test_supported_cp_version_manylinux(env):
         got = _select_whl(
             whls = whls,
             platforms = ["manylinux_x86_64"],
-            want_abis = ["none"],
+            whl_abi_tags = ["none"],
             python_version = "3.{}".format(minor_version),
         )
         _match(env, [got], match)
@@ -187,7 +187,7 @@ def _test_ignore_unsupported(env):
     got = _select_whl(
         whls = whls,
         platforms = ["any"],
-        want_abis = ["none"],
+        whl_abi_tags = ["none"],
         python_version = "3.0",
     )
     if got:
@@ -205,7 +205,7 @@ def _test_match_abi_and_not_py_version(env):
     got = _select_whl(
         whls = whls,
         platforms = platforms,
-        want_abis = ["abi3", "cp37m"],
+        whl_abi_tags = ["abi3", "cp37m"],
         python_version = "3.7",
     )
     _match(
@@ -217,7 +217,7 @@ def _test_match_abi_and_not_py_version(env):
     got = _select_whl(
         whls = whls,
         platforms = platforms[::-1],
-        want_abis = ["abi3", "cp37m"],
+        whl_abi_tags = ["abi3", "cp37m"],
         python_version = "3.7",
     )
     _match(
@@ -237,7 +237,7 @@ def _test_select_filename_with_many_tags(env):
             "musllinux_*_i686",
             "manylinux_*_i686",
         ],
-        want_abis = ["none", "abi3", "cp39"],
+        whl_abi_tags = ["none", "abi3", "cp39"],
         python_version = "3.9",
         limit = 5,
     )
@@ -261,7 +261,7 @@ def _test_freethreaded_wheels(env):
             "any",
             "musllinux_*_x86_64",
         ],
-        want_abis = ["none", "abi3", "cp313", "cp313t"],
+        whl_abi_tags = ["none", "abi3", "cp313", "cp313t"],
         python_version = "3.13",
         limit = 8,
     )

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ pip.default(`
`172`	`172`	`os_name = "windows",`
`173`	`173`	`platform = "windows_aarch64",`
`174`	`174`	`platform_tags = ["win_amd64"],`
`175`		`- want_abis = [], # default to all ABIs`
	`175`	`+ whl_abi_tags = [], # default to all ABIs`
`176`	`176`	`)`
`177`	`177`
`178`	`178`	`# To fetch pip dependencies, use pip.parse. We can pass in various options,`