Rename toolchain_target_settings to add_target_settings in PR scoped files

Author: rickeylev

python/private/python.bzl

@@ -405,7 +405,7 @@ def _python_impl(module_ctx):
 
     # Extra target_settings to add to every registered toolchain, e.g. for
     # gating the default toolchains behind a custom config_setting.
-    global_toolchain_target_settings = py.config.toolchain_target_settings
+    global_add_target_settings = py.config.add_target_settings
 
     # Split the toolchain info into separate objects so they can be passed onto
     # the repository rule.
@@ -418,7 +418,7 @@ def _python_impl(module_ctx):
 
         # The target_settings attribute may not be present for users
         # patching python/versions.bzl.
-        toolchain_ts_map[key] = getattr(entry.platform, "target_settings", []) + global_toolchain_target_settings
+        toolchain_ts_map[key] = getattr(entry.platform, "target_settings", []) + global_add_target_settings
         toolchain_platform_keys[key] = entry.platform_name
         toolchain_python_versions[key] = entry.full_python_version
 
@@ -706,8 +706,8 @@ def _process_global_overrides(*, tag, default, _fail = fail):
 
         default["minor_mapping"] = tag.minor_mapping
 
-    if tag.toolchain_target_settings:
-        default["toolchain_target_settings"] = list(tag.toolchain_target_settings)
+    if tag.add_target_settings:
+        default["add_target_settings"] = list(tag.add_target_settings)
 
     forwarded_attrs = sorted(AUTH_ATTRS) + [
         "base_url",
@@ -816,7 +816,7 @@ def _get_toolchain_config(*, modules, _fail = fail):
     )
 
     register_all_versions = default.pop("register_all_versions", False)
-    toolchain_target_settings = default.pop("toolchain_target_settings", [])
+    add_target_settings = default.pop("add_target_settings", [])
     kwargs = default.pop("kwargs", {})
 
     versions = {}
@@ -842,7 +842,7 @@ def _get_toolchain_config(*, modules, _fail = fail):
         minor_mapping = minor_mapping,
         default = default,
         register_all_versions = register_all_versions,
-        toolchain_target_settings = toolchain_target_settings,
+        add_target_settings = add_target_settings,
     )
 
 def _compute_default_python_version(mctx):
@@ -1108,6 +1108,30 @@ _override = tag_class(
 :::
 """,
     attrs = {
+        "add_target_settings": attr.string_list(
+            mandatory = False,
+            doc = """\
+A list of `config_setting` labels to add to the `target_settings` of every
+toolchain registered by this module extension. This is useful for creating
+separate "families" of toolchains gated behind custom build settings.
+
+For example, to ensure the default prebuilt toolchains are only resolved when
+a `prebuilt` config setting is active:
+
+```starlark
+python.override(
+    add_target_settings = ["@@//:python_toolchain_family_prebuilt"],
+)
+```
+
+These settings are appended to the `target_settings` of all toolchains
+registered by the extension, including any that already have settings
+from `python.single_version_platform_override`.
+
+:::{versionadded} VERSION_NEXT_FEATURE
+:::
+""",
+        ),
         "available_python_versions": attr.string_list(
             mandatory = False,
             doc = """\
@@ -1153,30 +1177,6 @@ The values in this mapping override the default values and do not replace them.
             default = {},
         ),
         "register_all_versions": attr.bool(default = False, doc = "Add all versions"),
-        "toolchain_target_settings": attr.string_list(
-            mandatory = False,
-            doc = """\
-A list of `config_setting` labels to add to the `target_settings` of every
-toolchain registered by this module extension. This is useful for creating
-separate "families" of toolchains gated behind custom build settings.
-
-For example, to ensure the default prebuilt toolchains are only resolved when
-a `prebuilt` config setting is active:
-
-```starlark
-python.override(
-    toolchain_target_settings = ["@@//:python_toolchain_family_prebuilt"],
-)
-```
-
-These settings are appended to the `target_settings` of all toolchains
-registered by the extension, including any that already have settings
-from `python.single_version_platform_override`.
-
-:::{versionadded} VERSION_NEXT_FEATURE
-:::
-""",
-        ),
     } | AUTH_ATTRS,
 )
 

tests/integration/toolchain_target_settings/BUILD.bazel

@@ -12,7 +12,7 @@ string_flag(
 )
 
 # Matches when the "prebuilt" family is selected.
-# This is referenced in MODULE.bazel's python.override(toolchain_target_settings=...).
+# This is referenced in MODULE.bazel's python.override(add_target_settings=...).
 config_setting(
     name = "is_prebuilt",
     flag_values = {
@@ -30,7 +30,7 @@ config_setting(
 )
 
 # This target selects the "prebuilt" family via config_settings transition.
-# Since python.override(toolchain_target_settings = ["@@//:is_prebuilt"]) gates
+# Since python.override(add_target_settings = ["@@//:is_prebuilt"]) gates
 # the default toolchains, this should succeed: the flag matches, the config_setting
 # is satisfied, and the default 3.13 toolchain resolves.
 py_test(

tests/integration/toolchain_target_settings/MODULE.bazel

@@ -15,7 +15,7 @@ python.toolchain(python_version = "3.13")
 # This prevents them from being a silent fallback when a different toolchain
 # family is requested.
 python.override(
-    toolchain_target_settings = ["@@//:is_prebuilt"],
+    add_target_settings = ["@@//:is_prebuilt"],
 )
 
 # Register //:family as a transition setting so py_binary/py_test

tests/integration/toolchain_target_settings_test.py

@@ -1,4 +1,4 @@
-"""Integration test for python.override(toolchain_target_settings=...).
+"""Integration test for python.override(add_target_settings=...).
 
 Verifies that when all default toolchains are gated behind a config_setting,
 requesting a different (unregistered) toolchain family produces a toolchain
@@ -10,7 +10,7 @@
 from tests.integration import runner
 
 
-class ToolchainTargetSettingsTest(runner.TestCase):
+class AddTargetSettingsTest(runner.TestCase):
     def test_prebuilt_family_resolves(self):
         """Building with the 'prebuilt' family should succeed.
 
@@ -24,7 +24,7 @@ def test_custom_family_without_toolchain_fails(self):
         """Building with the 'custom' family should fail.
 
         No toolchains have target_settings = [":is_custom"], and the default
-        toolchains are gated behind ":is_prebuilt" (via toolchain_target_settings),
+        toolchains are gated behind ":is_prebuilt" (via add_target_settings),
         so toolchain resolution should fail with no matching toolchain.
         """
         result = self.run_bazel("build", "//:custom_no_toolchain_test", check=False)

tests/python/python_tests.bzl

@@ -54,15 +54,15 @@ def _override(
         minor_mapping = {},
         netrc = "",
         register_all_versions = False,
-        toolchain_target_settings = []):
+        add_target_settings = []):
     return struct(
         auth_patterns = auth_patterns,
         available_python_versions = available_python_versions,
         base_url = base_url,
         minor_mapping = minor_mapping,
         netrc = netrc,
         register_all_versions = register_all_versions,
-        toolchain_target_settings = toolchain_target_settings,
+        add_target_settings = add_target_settings,
     )
 
 def _rules_python_module(is_root = False):
@@ -467,15 +467,15 @@ def _test_auth_overrides(env):
 
 _tests.append(_test_auth_overrides)
 
-def _test_toolchain_target_settings(env):
+def _test_add_target_settings(env):
     py = parse_modules(
         module_ctx = mocks.mctx(
             _mod(
                 name = "my_module",
                 toolchain = [_toolchain("3.12")],
                 override = [
                     _override(
-                        toolchain_target_settings = [
+                        add_target_settings = [
                             "@@//my:custom_setting",
                         ],
                     ),
@@ -488,10 +488,10 @@ def _test_toolchain_target_settings(env):
     )
 
     env.expect.that_collection(
-        py.config.toolchain_target_settings,
+        py.config.add_target_settings,
     ).contains_exactly(["@@//my:custom_setting"])
 
-_tests.append(_test_toolchain_target_settings)
+_tests.append(_test_add_target_settings)
 
 def _test_add_new_version(env):
     py = parse_modules(