cleanup

Author: rickeylev

MODULE.bazel

@@ -125,16 +125,11 @@ dev_python.override(
     register_all_versions = True,
 )
 
-# Necessary so single_version_platform_override with a new version works
-##dev_python.toolchain(python_version = "3.13")
-
 # For testing an arbitrary runtime triggered by a custom flag.
 # See //tests/toolchains:custom_platform_toolchain_test
 dev_python.single_version_platform_override(
     platform = "linux-x86-install-only-stripped",
-    ##python_version = "3.13.3",
     python_version = "3.13.1",
-    ##sha256 = "01d08b9bc8a96698b9d64c2fc26da4ecc4fa9e708ce0a34fb88f11ab7e552cbd",
     sha256 = "56817aa976e4886bec1677699c136cb01c1cdfe0495104c0d8ef546541864bbb",
     target_compatible_with = [
         "@platforms//os:linux",
@@ -144,7 +139,6 @@ dev_python.single_version_platform_override(
         "@@//tests/support:is_custom_runtime_linux-x86-install-only-stripped",
     ],
     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(

docs/toolchains.md

@@ -261,7 +261,6 @@ that is activated for Linux x86 builds when the custom flag
 bazel_dep(name = "bazel_skylib", version = "1.7.1.")
 bazel_dep(name = "rules_python", version = "1.5.0")
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
-python.toolchain(python_version="3.13.3")
 python.single_version_platform_override(
     platform = "my-platform",
     python_version = "3.13.3",
@@ -290,8 +289,6 @@ config_setting(
 Notes:
 - While any URL and archive can be used, it's assumed their content looks how
   a python-build-standalone archive looks.
-- `python.toolchain()` is required if the version is unknown; if the version
-  is already known, it can be omitted.
 - A "version aware" toolchain is registered, which means the Python version flag
   must also match (e.g. `--@rules_python//python/config_settings:python_version=3.13.3`
   must be set -- see `minor_mapping` and `is_default` for controls and docs

python/private/python.bzl

@@ -37,6 +37,7 @@ def parse_modules(*, module_ctx, logger, _fail = fail):
 
     Args:
         module_ctx: {type}`module_ctx` module context.
+        logger: {type}`repo_utils.logger` A logger to use.
         _fail: {type}`function` the failure function, mainly for testing.
 
     Returns:
@@ -335,7 +336,6 @@ def _python_impl(module_ctx):
             **kwargs
         )
         if not register_result.impl_repos:
-            fail("hit")
             continue
 
         host_platforms = {}
@@ -674,13 +674,7 @@ 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:
-        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
+        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
@@ -712,7 +706,9 @@ def _process_single_version_platform_overrides(*, tag, _fail = fail, default):
             arch = "UNKNOWN_CUSTOM_ARCH"
 
         # Move the override earlier in the ordering -- the platform key ordering
-        # becomes the toolchain ordering within the version.
+        # becomes the toolchain ordering within the version. This allows the
+        # override to have a superset of constraints from a regular runtimes
+        # (e.g. same platform, but with a custom flag required).
         override_first = {
             tag.platform: platform_info(
                 compatible_with = target_compatible_with,

python/private/pythons_hub.bzl

@@ -141,15 +141,15 @@ This rule also writes out the various toolchains for the different Python versio
 """,
     implementation = _hub_repo_impl,
     attrs = {
+        "default_python_version": attr.string(
+            doc = "Default Python version for the build in `X.Y` or `X.Y.Z` format.",
+            mandatory = True,
+        ),
         "host_compatible_repo_names": attr.string_list(
             doc = "The base repo name for toolchains ('python_3_10', no " +
                   "platform suffix)",
             mandatory = True,
         ),
-        "default_python_version": attr.string(
-            doc = "Default Python version for the build in `X.Y` or `X.Y.Z` format.",
-            mandatory = True,
-        ),
         "minor_mapping": attr.string_dict(
             doc = "The minor mapping of the `X.Y` to `X.Y.Z` format that is used in config settings.",
             mandatory = True,

python/private/repo_utils.bzl

@@ -405,11 +405,13 @@ def _get_platforms_cpu_name(mrctx = None, *, arch = None):
 
     Args:
         mrctx: module_ctx or repository_ctx.
+        arch: {type}`str` Arch to map to @platforms cpu. If not set, taken
+            from `mrctx`.
 
     Returns:
         `str`. The target name.
     """
-    if mrctx:
+    if arch == None:
         arch = mrctx.os.arch.lower()
 
     if arch in ["i386", "i486", "i586", "i686", "i786", "x86"]:

python/private/toolchains_repo.bzl

@@ -604,26 +604,16 @@ def _get_host_impl_repo_name(*, rctx, logger, python_version, os_name, cpu_name,
                 candidates,
             ))
         elif preference not in candidates:
-            # todo: need to map names like 3_13_0_linux_x86_64 back to
-            # the input values. Ah, er, wait
-            # Is this working?
-            # The return value is appended to this repo's name.
-            # This repo's name is e.g. python_3_13.
-            # the net result would be
-            # python_3_10_3_13_0_linux_x86_64
-            # which isn't a valid name
             return logger.fail("Please choose a preferred interpreter out of the following platforms: {}".format(candidates))
         else:
             candidates = [preference]
 
     if candidates:
         platform_name, meta = candidates[0]
-        print("multiple candidates:", candidates)
         suffix = getattr(meta, "impl_repo_name", None)
         if not suffix:
             suffix = platform_name
         return suffix
-        ##return getattr(meta, "impl_repo_name", platform_name)
 
     return logger.fail("Could not find a compatible 'host' python for '{os_name}', '{cpu_name}' from the loaded platforms: {platforms}".format(
         os_name = os_name,