toolchain ordering: something wrong with it

Author: rickeylev

MODULE.bazel

@@ -133,16 +133,19 @@ dev_python.toolchain(python_version = "3.13")
 # See //tests/toolchains:custom_platform_toolchain_test
 dev_python.single_version_platform_override(
     platform = "linux-x86-install-only-stripped",
-    python_version = "3.13.3",
-    sha256 = "01d08b9bc8a96698b9d64c2fc26da4ecc4fa9e708ce0a34fb88f11ab7e552cbd",
+    ##python_version = "3.13.3",
+    python_version = "3.13.1",
+    ##sha256 = "01d08b9bc8a96698b9d64c2fc26da4ecc4fa9e708ce0a34fb88f11ab7e552cbd",
+    sha256 = "56817aa976e4886bec1677699c136cb01c1cdfe0495104c0d8ef546541864bbb",
     target_compatible_with = [
         "@platforms//os:linux",
         "@platforms//cpu:x86_64",
     ],
     target_settings = [
         "@@//tests/support:is_custom_runtime_linux-x86-install-only-stripped",
     ],
-    urls = ["https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3+20250409-x86_64-unknown-linux-gnu-install_only_stripped.tar.gz"],
+    urls = ["https://github.com/astral-sh/python-build-standalone/releases/download/20250115/cpython-3.13.1+20250115-x86_64-unknown-linux-gnu-install_only_stripped.tar.gz"],
+    ##urls = ["https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3+20250409-x86_64-unknown-linux-gnu-install_only_stripped.tar.gz"],
 )
 
 dev_pip = use_extension(

python/private/python.bzl

@@ -305,6 +305,10 @@ def _python_impl(module_ctx):
     # list[str] of the repo names for host compatible repos
     all_host_compatible_repo_names = []
 
+    # todo: The 3.13.1-custom-runtime ends up _last_ in the toolchain
+    # ordering, so it never gets picked.
+    # Need to move it first
+
     # Create the underlying python_repository repos that contain the
     # python runtimes and their toolchain implementation definitions.
     for i, toolchain_info in enumerate(py.toolchains):
@@ -331,10 +335,13 @@ def _python_impl(module_ctx):
             **kwargs
         )
         if not register_result.impl_repos:
+            fail("hit")
             continue
 
         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,
@@ -669,7 +676,14 @@ def _process_single_version_platform_overrides(*, tag, _fail = fail, default):
     if tag.sha256:
         available_versions[tag.python_version].setdefault("sha256", {})[tag.platform] = tag.sha256
     if tag.strip_prefix:
-        available_versions[tag.python_version].setdefault("strip_prefix", {})[tag.platform] = tag.strip_prefix
+        v = available_versions
+        v1 = available_versions[tag.python_version]
+        v1.setdefault("strip_prefix", {})
+        v2 = v1["strip_prefix"]
+        print(v2)
+        v2[tag.platform] = tag.strip_prefix
+        ##available_versions[tag.python_version].setdefault("strip_prefix", {})[tag.platform] = tag.strip_prefix
+
     if tag.urls:
         available_versions[tag.python_version].setdefault("url", {})[tag.platform] = tag.urls
 
@@ -784,22 +798,29 @@ def _get_toolchain_config(*, modules, _fail = fail):
     """
 
     # Items that can be overridden
-    available_versions = {
-        version: {
-            # Use a dicts straight away so that we could do URL overrides for a
-            # single version.
-            "sha256": dict(item["sha256"]),
-            "strip_prefix": {
-                platform: item["strip_prefix"]
-                for platform in item["sha256"]
-            } if type(item["strip_prefix"]) == type("") else item["strip_prefix"],
-            "url": {
-                platform: [item["url"]]
-                for platform in item["sha256"]
-            } if type(item["url"]) == type("") else item["url"],
-        }
-        for version, item in TOOL_VERSIONS.items()
-    }
+    available_versions = {}
+    for py_version, item in TOOL_VERSIONS.items():
+        available_versions[py_version] = {}
+        available_versions[py_version]["sha256"] = dict(item["sha256"])
+        platforms = item["sha256"].keys()
+
+        strip_prefix = item["strip_prefix"]
+        if type(strip_prefix) == type(""):
+            available_versions[py_version]["strip_prefix"] = {
+                platform: strip_prefix
+                for platform in platforms
+            }
+        else:
+            available_versions[py_version]["strip_prefix"] = dict(strip_prefix)
+        url = item["url"]
+        if type(url) == type(""):
+            available_versions[py_version]["url"] = {
+                platform: url
+                for platform in platforms
+            }
+        else:
+            available_versions[py_version]["url"] = dict(url)
+
     default = {
         "base_url": DEFAULT_RELEASE_BASE_URL,
         "platforms": dict(PLATFORMS),  # Copy so it's mutable.

python/private/pythons_hub.bzl

@@ -96,6 +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, "===")
     rctx.file(
         "BUILD.bazel",
         _hub_build_file_content(rctx),

python/private/repo_utils.bzl

@@ -31,13 +31,15 @@ def _is_repo_debug_enabled(mrctx):
     """
     return _getenv(mrctx, REPO_DEBUG_ENV_VAR) == "1"
 
-def _logger(mrctx, name = None):
+def _logger(mrctx = None, name = None, verbosity_level = None):
     """Creates a logger instance for printing messages.
 
     Args:
         mrctx: repository_ctx or module_ctx object. If the attribute
             `_rule_name` is present, it will be included in log messages.
         name: name for the logger. Optional for repository_ctx usage.
+        verbosity_level: {type}`int | None` verbosity level. If not set,
+            taken from `mrctx`
 
     Returns:
         A struct with attributes logging: trace, debug, info, warn, fail.
@@ -46,13 +48,14 @@ def _logger(mrctx, name = None):
         the logger injected into the function work as expected by terminating
         on the given line.
     """
-    if _is_repo_debug_enabled(mrctx):
-        verbosity_level = "DEBUG"
-    else:
-        verbosity_level = "WARN"
+    if verbosity_level == None:
+        if _is_repo_debug_enabled(mrctx):
+            verbosity_level = "DEBUG"
+        else:
+            verbosity_level = "WARN"
 
-    env_var_verbosity = _getenv(mrctx, REPO_VERBOSITY_ENV_VAR)
-    verbosity_level = env_var_verbosity or verbosity_level
+        env_var_verbosity = _getenv(mrctx, REPO_VERBOSITY_ENV_VAR)
+        verbosity_level = env_var_verbosity or verbosity_level
 
     verbosity = {
         "DEBUG": 2,

tests/python/python_tests.bzl

@@ -17,6 +17,7 @@
 load("@pythons_hub//:versions.bzl", "MINOR_MAPPING")
 load("@rules_testing//lib:test_suite.bzl", "test_suite")
 load("//python/private:python.bzl", "parse_modules")  # buildifier: disable=bzl-visibility
+load("//python/private:repo_utils.bzl", "repo_utils")  # buildifier: disable=bzl-visibility
 
 _tests = []
 
@@ -131,13 +132,18 @@ def _single_version_platform_override(
         python_version = python_version,
         patch_strip = patch_strip,
         patches = patches,
+        target_compatible_with = [],
+        target_settings = [],
+        os_name = "",
+        arch = "",
     )
 
 def _test_default(env):
     py = parse_modules(
         module_ctx = _mock_mctx(
             _mod(name = "rules_python", toolchain = [_toolchain("3.11")]),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     # The value there should be consistent in bzlmod with the automatically
@@ -168,6 +174,7 @@ def _test_default_some_module(env):
         module_ctx = _mock_mctx(
             _mod(name = "rules_python", toolchain = [_toolchain("3.11")], is_root = False),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.11")
@@ -186,6 +193,7 @@ def _test_default_with_patch_version(env):
         module_ctx = _mock_mctx(
             _mod(name = "rules_python", toolchain = [_toolchain("3.11.2")]),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.11.2")
@@ -207,6 +215,7 @@ def _test_default_non_rules_python(env):
             # does not make any calls to the extension.
             _mod(name = "rules_python", toolchain = [_toolchain("3.11")], is_root = False),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.11")
@@ -228,6 +237,7 @@ def _test_default_non_rules_python_ignore_root_user_error(env):
             ),
             _mod(name = "rules_python", toolchain = [_toolchain("3.11")]),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_bool(py.config.default["ignore_root_user_error"]).equals(False)
@@ -257,6 +267,7 @@ def _test_default_non_rules_python_ignore_root_user_error_non_root_module(env):
             _mod(name = "some_module", toolchain = [_toolchain("3.12", ignore_root_user_error = False)]),
             _mod(name = "rules_python", toolchain = [_toolchain("3.11")]),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.13")
@@ -302,6 +313,7 @@ def _test_toolchain_ordering(env):
             ),
             _mod(name = "rules_python", toolchain = [_toolchain("3.11")]),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
     got_versions = [
         t.python_version
@@ -347,6 +359,7 @@ def _test_default_from_defaults(env):
                 is_root = True,
             ),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.11")
@@ -374,6 +387,7 @@ def _test_default_from_defaults_env(env):
             ),
             environ = {"PYENV_VERSION": "3.12"},
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.12")
@@ -401,6 +415,7 @@ def _test_default_from_defaults_file(env):
             ),
             mocked_files = {"@@//:.python-version": "3.12\n"},
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.12")
@@ -427,6 +442,7 @@ def _test_first_occurance_of_the_toolchain_wins(env):
                 "RULES_PYTHON_BZLMOD_DEBUG": "1",
             },
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.12")
@@ -472,6 +488,7 @@ def _test_auth_overrides(env):
             ),
             _mod(name = "rules_python", toolchain = [_toolchain("3.11")]),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_dict(py.config.default).contains_at_least({
@@ -541,6 +558,7 @@ def _test_add_new_version(env):
                 ],
             ),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.13")
@@ -609,6 +627,7 @@ def _test_register_all_versions(env):
                 ],
             ),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.13")
@@ -685,6 +704,7 @@ def _test_add_patches(env):
                 ],
             ),
         ),
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
 
     env.expect.that_str(py.default_python_version).equals("3.13")
@@ -731,6 +751,7 @@ def _test_fail_two_overrides(env):
             ),
         ),
         _fail = errors.append,
+        logger = repo_utils.logger(verbosity_level = 0, name = "python"),
     )
     env.expect.that_collection(errors).contains_exactly([
         "Only a single 'python.override' can be present",
@@ -758,6 +779,7 @@ def _test_single_version_override_errors(env):
                 ),
             ),
             _fail = errors.append,
+            logger = repo_utils.logger(verbosity_level = 0, name = "python"),
         )
         env.expect.that_collection(errors).contains_exactly([test.want_error])
 
@@ -795,6 +817,7 @@ def _test_single_version_platform_override_errors(env):
                 ),
             ),
             _fail = lambda *a: errors.append(" ".join(a)),
+            logger = repo_utils.logger(verbosity_level = 0, name = "python"),
         )
         env.expect.that_collection(errors).contains_exactly([test.want_error])
 

tests/toolchains/BUILD.bazel

@@ -23,7 +23,7 @@ py_reconfig_test(
     name = "custom_platform_toolchain_test",
     srcs = ["custom_platform_toolchain_test.py"],
     custom_runtime = "linux-x86-install-only-stripped",
-    python_version = "3.13.3",
+    python_version = "3.13.1",
     target_compatible_with = [
         "@platforms//os:linux",
         "@platforms//cpu:x86_64",