Merge branch 'main' into fix.conflict.merging.files

Author: rickeylev

CHANGELOG.md

@@ -108,6 +108,8 @@ END_UNRELEASED_TEMPLATE
 {#v0-0-0-added}
 ### Added
 * (toolchains) `3.9.25` Python toolchain from [20251031] release.
+* (toolchains) `3.13.10`, `3.14.1` Python toolchain from [20251202] release.
+* (toolchains) `3.13.11`, `3.14.2`, `3.15.0a2` Python toolchains from [20251209] release.
 * (pypi) API to tell `pip.parse` which platforms users care about. This is very useful to  ensure
   that when users do `bazel query` for their deps, they don't have to download all of the
   dependencies for all of the available wheels. Torch wheels can be up of 1GB and it takes a lot
@@ -118,6 +120,9 @@ END_UNRELEASED_TEMPLATE
   become mandatory if any cross-builds are required from the next release.
 
 [20251031]: https://github.com/astral-sh/python-build-standalone/releases/tag/20251031
+[20251202]: https://github.com/astral-sh/python-build-standalone/releases/tag/20251202
+[20251209]: https://github.com/astral-sh/python-build-standalone/releases/tag/20251209
+
 {#v1-7-0}
 ## [1.7.0] - 2025-10-11
 

MODULE.bazel

@@ -305,6 +305,11 @@ dev_pip = use_extension(
         parallel_download = False,
         python_version = python_version,
         requirements_lock = "//docs:requirements.txt",
+        # Ensure that we are setting up the following platforms
+        target_platforms = [
+            "{os}_{arch}",
+            "{os}_{arch}_freethreaded",
+        ],
     )
     for python_version in [
         "3.9",

docs/BUILD.bazel

@@ -165,6 +165,8 @@ sphinx_build_binary(
     config_settings = {
         labels.BOOTSTRAP_IMPL: "script",
         labels.VENVS_SITE_PACKAGES: "yes",
+        labels.PY_FREETHREADED: "yes",
+        labels.PYTHON_VERSION: "3.14",
     },
     target_compatible_with = _TARGET_COMPATIBLE_WITH,
     deps = [

python/private/internal_config_repo.bzl

@@ -29,6 +29,7 @@ _ENABLE_DEPRECATION_WARNINGS_DEFAULT = "0"
 _CONFIG_TEMPLATE = """
 config = struct(
   build_python_zip_default = {build_python_zip_default},
+  supports_whl_extraction = {supports_whl_extraction},
   enable_pystar = True,
   enable_pipstar = {enable_pipstar},
   enable_deprecation_warnings = {enable_deprecation_warnings},
@@ -91,8 +92,20 @@ _TRANSITION_SETTINGS_DEBUG_TEMPLATE = """
 def _internal_config_repo_impl(rctx):
     # An empty version signifies a development build, which is treated as
     # the latest version.
-    bazel_major_version = int(native.bazel_version.split(".")[0]) if native.bazel_version else 99999
+    if native.bazel_version:
+        version_parts = native.bazel_version.split(".")
+        bazel_major_version = int(version_parts[0])
+        bazel_minor_version = int(version_parts[1])
+    else:
+        bazel_major_version = 99999
+        bazel_minor_version = 99999
+
+    supports_whl_extraction = False
     if bazel_major_version >= 8:
+        # Extracting .whl files requires Bazel 8.3.0 or later.
+        if bazel_major_version > 8 or bazel_minor_version >= 3:
+            supports_whl_extraction = True
+
         builtin_py_info_symbol = "None"
         builtin_py_runtime_info_symbol = "None"
         builtin_py_cc_link_params_provider = "None"
@@ -107,6 +120,7 @@ def _internal_config_repo_impl(rctx):
         enable_deprecation_warnings = _bool_from_environ(rctx, _ENABLE_DEPRECATION_WARNINGS_ENVVAR_NAME, _ENABLE_DEPRECATION_WARNINGS_DEFAULT),
         builtin_py_info_symbol = builtin_py_info_symbol,
         builtin_py_runtime_info_symbol = builtin_py_runtime_info_symbol,
+        supports_whl_extraction = str(supports_whl_extraction),
         builtin_py_cc_link_params_provider = builtin_py_cc_link_params_provider,
         bazel_8_or_later = str(bazel_major_version >= 8),
         bazel_9_or_later = str(bazel_major_version >= 9),

python/private/pypi/extension.bzl

@@ -665,7 +665,7 @@ EXPERIMENTAL: this may be removed without notice.
 """,
         ),
         "target_platforms": attr.string_list(
-            default = ["{os}_{arch}"],
+            default = [],
             doc = """\
 The list of platforms for which we would evaluate the requirements files. If you need to be able to
 only evaluate for a particular platform (e.g. "linux_x86_64"), then put it in here.

python/private/pypi/hub_builder.bzl

@@ -141,9 +141,10 @@ def _pip_parse(self, module_ctx, pip_attr):
         module_ctx,
         python_version = full_python_version,
         config = self._config,
-        # FIXME @aignas 2025-12-06: should we have this behaviour?
-        # TODO @aignas 2025-12-06: use target_platforms always even when the get_index_urls is set.
-        target_platforms = [] if default_cross_setup else pip_attr.target_platforms,
+        # TODO @aignas 2025-12-09: flip or part to default to 'os_arch' after
+        # VERSION_NEXT_FEATURE is released and set the default of the `target_platforms` attribute
+        # to `{os}_{arch}`.
+        target_platforms = pip_attr.target_platforms or ([] if default_cross_setup else ["{os}_{arch}"]),
     )
     _add_group_map(self, pip_attr.experimental_requirement_cycles)
     _add_extra_aliases(self, pip_attr.extra_hub_aliases)

python/private/pypi/requirements_files_by_platform.bzl

@@ -144,6 +144,8 @@ def requirements_files_by_platform(
 
     input_platforms = platforms
     default_platforms = [_platform(p, python_version) for p in platforms]
+    if logger:
+        logger.debug(lambda: "Input platforms: {}".format(input_platforms))
 
     if platforms_from_args:
         lock_files = [

python/private/pypi/whl_library.bzl

@@ -377,10 +377,7 @@ def _whl_library_impl(rctx):
     #
     # Remove non-pipstar and config_load check when we release rules_python 2.
     if enable_pipstar:
-        # Extracting .whl files requires Bazel 8.3.0 or later, so require a
-        # minimum of Bazel 9.0.0 to ensure compatibilty with earlier versions
-        # of Bazel 8.
-        if rp_config.bazel_9_or_later:
+        if rp_config.supports_whl_extraction:
             extract_path = whl_path
         else:
             extract_path = rctx.path(whl_path.basename + ".zip")
@@ -389,7 +386,7 @@ def _whl_library_impl(rctx):
             archive = extract_path,
             output = "site-packages",
         )
-        if not rp_config.bazel_9_or_later:
+        if not rp_config.supports_whl_extraction:
             rctx.delete(extract_path)
 
         metadata = whl_metadata(