consts with hyphen, sort that supports ft+musl

Author: rickeylev

python/private/toolchains_repo.bzl

@@ -462,12 +462,10 @@ def sorted_host_platforms(platform_map):
 
     def platform_keyer(name):
         # Ascending sort: lower is higher precedence
-        pref = 0
-        if name.endswith("-" + FREETHREADED):
-            pref = 1
-        elif name.endswith("-" + MUSL):
-            pref = 2
-        return (pref, name)
+        return (
+            1 if MUSL in name else 0,
+            1 if FREETHREADED in name else 0,
+        )
 
     sorted_platform_keys = sorted(platform_map.keys(), key = platform_keyer)
     return {

python/versions.bzl

@@ -20,8 +20,8 @@ MACOS_NAME = "osx"
 LINUX_NAME = "linux"
 WINDOWS_NAME = "windows"
 
-FREETHREADED = "freethreaded"
-MUSL = "musl"
+FREETHREADED = "-freethreaded"
+MUSL = "-musl"
 INSTALL_ONLY = "install_only"
 
 DEFAULT_RELEASE_BASE_URL = "https://github.com/astral-sh/python-build-standalone/releases/download"
@@ -847,7 +847,7 @@ def _generate_platforms():
         for p, v in platforms.items()
         for suffix, freethreadedness in {
             "": is_freethreaded_no,
-            "-" + FREETHREADED: is_freethreaded_yes,
+            FREETHREADED: is_freethreaded_yes,
         }.items()
     }
 
@@ -881,11 +881,11 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
     release_filename = None
     rendered_urls = []
     for u in url:
-        p, _, _ = platform.partition("-" + FREETHREADED)
+        p, _, _ = platform.partition(FREETHREADED)
 
-        if FREETHREADED in platform:
+        if FREETHREADED.lstrip("-") in platform:
             build = "{}+{}-full".format(
-                FREETHREADED,
+                FREETHREADED.lstrip("-"),
                 {
                     "aarch64-apple-darwin": "pgo+lto",
                     "aarch64-unknown-linux-gnu": "lto",