[NOT FOR UPSTREAM] stash patch from TF

Author: gns

python/private/pypi/deps.bzl

@@ -51,8 +51,8 @@ _RULE_DEPS = [
     ),
     (
         "pypi__packaging",
-        "https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl",
-        "2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
+        "https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl",
+        "09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759",
     ),
     (
         "pypi__pep517",
@@ -61,8 +61,8 @@ _RULE_DEPS = [
     ),
     (
         "pypi__pip",
-        "https://files.pythonhosted.org/packages/8a/6a/19e9fe04fca059ccf770861c7d5721ab4c2aebc539889e97c7977528a53b/pip-24.0-py3-none-any.whl",
-        "ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc",
+        "https://files.pythonhosted.org/packages/ef/7d/500c9ad20238fcfcb4cb9243eede163594d7020ce87bd9610c9e02771876/pip-24.3.1-py3-none-any.whl",
+        "3790624780082365f47549d032f3770eeb2b1e8bd1f7b2e02dace1afa361b4ed",
     ),
     (
         "pypi__pip_tools",

python/private/pypi/evaluate_markers.bzl

@@ -20,7 +20,7 @@ load(":pypi_repo_utils.bzl", "pypi_repo_utils")
 SRCS = [
     # When the version, or any of the files in `packaging` package changes,
     # this file will change as well.
-    Label("@pypi__packaging//:packaging-24.0.dist-info/RECORD"),
+    Label("@pypi__packaging//:packaging-24.2.dist-info/RECORD"),
     Label("//python/private/pypi/requirements_parser:resolve_target_platforms.py"),
     Label("//python/private/pypi/whl_installer:platform.py"),
 ]

python/private/python_bootstrap_template.txt

@@ -52,7 +52,14 @@ def GetWindowsPathWithUNCPrefix(path):
   # removed from common Win32 file and directory functions.
   # Related doc: https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later
   import platform
-  if platform.win32_ver()[1] >= '10.0.14393':
+  version = None
+  # The try-except block is needed to fix the flakiness of RBE tests
+  # on Windows 2022 using hermetic python 3.12.8.
+  try:
+    version = platform.win32_ver()[1]
+  except (ValueError, KeyError):
+    version = platform.win32_ver()[1]
+  if version and version >= '10.0.14393':
     return path
 
   # import sysconfig only now to maintain python 2.6 compatibility

python/private/python_register_toolchains.bzl

@@ -86,6 +86,7 @@ def python_register_toolchains(
     minor_mapping = minor_mapping or MINOR_MAPPING
 
     python_version = full_version(version = python_version, minor_mapping = minor_mapping)
+    python_version_kind = kwargs.pop("python_version_kind", "")
 
     toolchain_repo_name = "{name}_toolchains".format(name = name)
 
@@ -165,6 +166,7 @@ def python_register_toolchains(
     toolchain_aliases(
         name = name,
         python_version = python_version,
+        python_version_kind = python_version_kind,
         user_repository_name = name,
         platforms = loaded_platforms,
     )

python/private/toolchains_repo.bzl

@@ -130,6 +130,9 @@ def _toolchain_aliases_impl(rctx):
     (os_name, arch) = _get_host_os_arch(rctx, logger)
 
     host_platform = _get_host_platform(os_name, arch)
+    python_version_kind = rctx.attr.python_version_kind
+    if python_version_kind == "ft":
+        host_platform += "-freethreaded"
 
     is_windows = (os_name == WINDOWS_NAME)
     python3_binary_path = "python.exe" if is_windows else "bin/python3"
@@ -233,6 +236,10 @@ actions.""",
             doc = "List of platforms for which aliases shall be created",
         ),
         "python_version": attr.string(doc = "The Python version."),
+        "python_version_kind": attr.string(
+            doc = "Python version kind, e.g. ft (free-threaded)",
+            default = ""
+        ),
         "user_repository_name": attr.string(
             mandatory = True,
             doc = "The base name for all created repositories, like 'python38'.",