From 49cdf7d3fe000076d6432a34238e5d25f5b598d0 Mon Sep 17 00:00:00 2001
From: Ignas Anikevicius <240938+aignas@users.noreply.github.com>
Date: Mon, 10 Jun 2024 19:31:09 +0900
Subject: [PATCH] fix: make the pythons_hub platform independent (#1946)

With this change we can finally have platform independent bzlmod lock
files in rules_python. This cleans up code paths that were not being
used in the `pip` extension for a while and the replacement is noted in
the CHANGELOG.

Fixes #1643
---
 CHANGELOG.md                          |  4 ++++
 python/private/bzlmod/pythons_hub.bzl | 24 ++----------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9c502a252..7d0e16f020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,10 @@ A brief description of the categories of changes:
   `{pip_hub_prefix}_{wheel_name}_{py_tag}_{abi_tag}_{platform_tag}_{sha256}`,
   which is an implementation detail which should not be relied on and is there
   purely for better debugging experience.
+* (bzlmod) The `pythons_hub//:interpreters.bzl` no longer has platform-specific
+  labels which where left there for compatibility reasons. Move to
+  `python_{version}_host` keys if you would like to have access to a Python
+  interpreter that can be used in a repository rule context.
 
 ### Fixed
 * (gazelle) Remove `visibility` from `NonEmptyAttr`.
diff --git a/python/private/bzlmod/pythons_hub.bzl b/python/private/bzlmod/pythons_hub.bzl
index b002956bd9..7a8c874ed8 100644
--- a/python/private/bzlmod/pythons_hub.bzl
+++ b/python/private/bzlmod/pythons_hub.bzl
@@ -14,12 +14,9 @@
 
 "Repo rule used by bzlmod extension to create a repo that has a map of Python interpreters and their labels"
 
-load("//python:versions.bzl", "WINDOWS_NAME")
 load("//python/private:full_version.bzl", "full_version")
 load(
     "//python/private:toolchains_repo.bzl",
-    "get_host_os_arch",
-    "get_host_platform",
     "python_toolchain_build_file_content",
 )
 
@@ -83,7 +80,7 @@ DEFAULT_PYTHON_VERSION = "{default_python_version}"
 """
 
 _line_for_hub_template = """\
-    "{key}": Label("@{name}_{platform}//:{path}"),
+    "{name}_host": Label("@{name}_host//:python"),
 """
 
 def _hub_repo_impl(rctx):
@@ -101,28 +98,11 @@ def _hub_repo_impl(rctx):
         executable = False,
     )
 
-    (os, arch) = get_host_os_arch(rctx)
-    platform = get_host_platform(os, arch)
-    is_windows = (os == WINDOWS_NAME)
-    path = "python.exe" if is_windows else "bin/python3"
-
     # Create a dict that is later used to create
     # a symlink to a interpreter.
     interpreter_labels = "".join([
-        _line_for_hub_template.format(
-            key = name + ("" if platform_str != "host" else "_host"),
-            name = name,
-            platform = platform_str,
-            path = p,
-        )
+        _line_for_hub_template.format(name = name)
         for name in rctx.attr.toolchain_user_repository_names
-        for platform_str, p in {
-            # NOTE @aignas 2023-12-21: maintaining the `platform` specific key
-            # here may be unneeded in the long term, but I am not sure if there
-            # are other users that depend on it.
-            platform: path,
-            "host": "python",
-        }.items()
     ])
 
     rctx.file(