move platform overrides first in platform ordering

Author: rickeylev

MODULE.bazel

@@ -126,7 +126,7 @@ dev_python.override(
 )
 
 # Necessary so single_version_platform_override with a new version works
-dev_python.toolchain(python_version = "3.13")
+##dev_python.toolchain(python_version = "3.13")
 
 # For testing an arbitrary runtime triggered by a custom flag.
 # See //tests/toolchains:custom_platform_toolchain_test

internal_dev_setup.bzl

@@ -42,7 +42,7 @@ def rules_python_internal_setup():
         toolchain_platform_keys = {},
         toolchain_python_versions = {},
         toolchain_set_python_version_constraints = {},
-        base_toolchain_repo_names = [],
+        host_compatible_repo_names = [],
     )
 
     runtime_env_repo(name = "rules_python_runtime_env_tc_info")

python/private/py_repositories.bzl

@@ -47,7 +47,7 @@ def py_repositories():
         toolchain_platform_keys = {},
         toolchain_python_versions = {},
         toolchain_set_python_version_constraints = {},
-        base_toolchain_repo_names = [],
+        host_compatible_repo_names = [],
     )
     http_archive(
         name = "bazel_skylib",

python/private/python.bzl

@@ -340,8 +340,6 @@ def _python_impl(module_ctx):
 
         host_platforms = {}
         for repo_name, (platform_name, platform_info) in register_result.impl_repos.items():
-            if "3.13.1" in full_python_version:
-                print("registered:", repo_name)
             toolchain_impls.append(struct(
                 # str: The base name to use for the toolchain() target
                 name = repo_name,
@@ -713,12 +711,23 @@ def _process_single_version_platform_overrides(*, tag, _fail = fail, default):
         if not arch:
             arch = "UNKNOWN_CUSTOM_ARCH"
 
-        default["platforms"][tag.platform] = platform_info(
-            compatible_with = target_compatible_with,
-            target_settings = tag.target_settings,
-            os_name = os_name,
-            arch = arch,
-        )
+        # Move the override earlier in the ordering -- the platform key ordering
+        # becomes the toolchain ordering within the version.
+        override_first = {
+            tag.platform: platform_info(
+                compatible_with = target_compatible_with,
+                target_settings = tag.target_settings,
+                os_name = os_name,
+                arch = arch,
+            ),
+        }
+        for key, value in default["platforms"].items():
+            # Don't replace our override with the old value
+            if key in override_first:
+                continue
+            override_first[key] = value
+
+        default["platforms"] = override_first
 
 def _process_global_overrides(*, tag, default, _fail = fail):
     if tag.available_python_versions:

python/private/pythons_hub.bzl

@@ -96,8 +96,8 @@ PYTHON_VERSIONS = {python_versions}
 def _hub_repo_impl(rctx):
     # Create the various toolchain definitions and
     # write them to the BUILD file.
-    content = _hub_build_file_content(rctx)
-    print(content, "===")
+    ##content = _hub_build_file_content(rctx)
+    ##print(content, "===")
     rctx.file(
         "BUILD.bazel",
         _hub_build_file_content(rctx),