Merge branch 'main' into runfiles-fix-upstream

Author: aignas

CHANGELOG.md

@@ -30,11 +30,13 @@ BEGIN_UNRELEASED_TEMPLATE
 
 {#v0-0-0-removed}
 ### Removed
+* (toolchain) Remove all of the python 3.9 toolchain versions except for the `3.9.25`.
+  This version has reached EOL and will no longer receive any security fixes, please update to
+  `3.10` or above.
 
-* Nothing removed.
 {#v0-0-0-changed}
 ### Changed
-* Nothing changed.
+* (toolchains) Use toolchains from the [20251031] release.
 
 {#v0-0-0-fixed}
 ### Fixed
@@ -47,8 +49,9 @@ BEGIN_UNRELEASED_TEMPLATE
 
 {#v0-0-0-added}
 ### Added
-* Nothing added.
+* (toolchains) `3.9.25` Python toolchain from [20251031] release.
 
+[20251031]: https://github.com/astral-sh/python-build-standalone/releases/tag/20251031
 
 END_UNRELEASED_TEMPLATE
 -->
@@ -79,10 +82,10 @@ END_UNRELEASED_TEMPLATE
 * (toolchains) `py_runtime` and `PyRuntimeInfo` reject Python 2 settings.
   Setting `py_runtime.python_version = "PY2"` or non-None
   `PyRuntimeInfo.py2_runtime` is an error.
-* (pypi) `pipstar` flag has been flipped to be enabled by default, to turn it
-  off use `RULES_PYTHON_ENABLE_PIPSTAR=0` environment variable. If you do, please
+* (pypi) `pipstar` flag has been implemented for `WORKSPACE` and can be flipped to be enabled using `RULES_PYTHON_ENABLE_PIPSTAR=1` environment variable. If you do, please
   add a comment to
-  [#2949](https://github.com/bazel-contrib/rules_python/issues/2949).
+  [#2949](https://github.com/bazel-contrib/rules_python/issues/2949) if you run into any
+  problems.
   With this release we are deprecating {obj}`pip.parse.experimental_target_platforms` and
   {obj}`pip_repository.experimental_target_platforms`. For users using `WORKSPACE` and
   vendoring the `requirements.bzl` file, please re-vendor so that downstream is unaffected
@@ -117,6 +120,8 @@ END_UNRELEASED_TEMPLATE
   ([#3339](https://github.com/bazel-contrib/rules_python/issues/3339)).
 * (uv) {obj}`//python/uv:lock.bzl%lock` now works with a local platform
   runtime.
+* (pypi) `linux_riscv64` is added to the platforms list in `_pip_repository_impl`,
+  which fixes [a build issue for tensorflow on riscv64](https://github.com/bazel-contrib/rules_python/discussions/2729).
 * (toolchains) WORKSPACE builds now correctly register musl and freethreaded
   variants. Setting {obj}`--py_linux_libc=musl` and `--py_freethreaded=yes` now
   activate them, respectively.

examples/BUILD.bazel

@@ -26,7 +26,7 @@ lock(
         "--universal",
         "--python-version=3.9",
     ],
-    python_version = "3.9.19",
+    python_version = "3.9",
 )
 
 lock(

examples/bzlmod/MODULE.bazel

@@ -55,7 +55,6 @@ python.override(
     # require versions not listed here.
     # available_python_versions = [
     #     "3.10.9",
-    #     "3.9.18",
     #     "3.9.19",
     #     # The following is used by the `other_module` and we need to include it here
     #     # as well.
@@ -65,7 +64,7 @@ python.override(
     # instead of rules_python's defaulting to the latest available version,
     # controls what full version is used when `3.x` is requested.
     minor_mapping = {
-        "3.9": "3.9.19",
+        "3.9": "3.9.25",
     },
 )
 

examples/pip_parse/MODULE.bazel

@@ -9,14 +9,14 @@ local_path_override(
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(
     # We can specify the exact version.
-    python_version = "3.9.13",
+    python_version = "3.9.25",
 )
 
 # You can use this repo mapping to ensure that your BUILD.bazel files don't need
 # to be updated when the python version changes to a different `3.9` version.
 use_repo(
     python,
-    python_3_9 = "python_3_9_13",
+    python_3_9 = "python_3_9_25",
 )
 
 pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
@@ -34,7 +34,7 @@ pip.parse(
     },
     hub_name = "pypi",
     # We need to use the same version here as in the `python.toolchain` call.
-    python_version = "3.9.13",
+    python_version = "3.9.25",
     requirements_lock = "//:requirements_lock.txt",
     requirements_windows = "//:requirements_windows.txt",
 )

examples/pip_parse/WORKSPACE

@@ -11,7 +11,7 @@ py_repositories()
 
 python_register_toolchains(
     name = "python_3_9",
-    python_version = "3.9.13",
+    python_version = "3.9.25",
 )
 
 load("@rules_python//python:pip.bzl", "pip_parse")

gazelle/examples/bzlmod_build_file_generation/.bazelrc

@@ -7,3 +7,10 @@ common --experimental_enable_bzlmod
 
 coverage --java_runtime_version=remotejdk_11
 common:bazel7.x --incompatible_python_disallow_native_rules
+
+# NOTE: This override is specific to the development of gazelle itself
+# and the testing of it during its BCR release presubmits.
+# In development of gazelle itself, we override it to the development
+# rules_python code. In the BCR presubmits, this override is removed
+# and the bazel_dep version of rules_python is used.
+common --override_module=rules_python=../../../

gazelle/examples/bzlmod_build_file_generation/MODULE.bazel

@@ -13,16 +13,7 @@ module(
 # For typical setups you set the version.
 # See the releases page for available versions.
 # https://github.com/bazel-contrib/rules_python/releases
-bazel_dep(name = "rules_python", version = "1.0.0")
-
-# NOTE: This override is removed for BCR presubmits and the version
-# specified by bazel_dep() is used instead.
-# The following loads rules_python from the file system.
-# For usual setups you should remove this local_path_override block.
-local_path_override(
-    module_name = "rules_python",
-    path = "../../..",
-)
+bazel_dep(name = "rules_python", version = "1.4.0")
 
 # The following stanza defines the dependency rules_python_gazelle_plugin.
 # For typical setups you set the version.

python/private/hermetic_runtime_repo_setup.bzl

@@ -179,17 +179,17 @@ def define_hermetic_runtime_toolchain_impl(
                 "libs/python{major}{minor}t.lib".format(**version_dict),
                 "libs/python3t.lib",
             ],
-            "@platforms//os:linux": [
-                "lib/libpython{major}.{minor}.so".format(**version_dict),
-                "lib/libpython{major}.{minor}.so.1.0".format(**version_dict),
-            ],
             "@platforms//os:macos": ["lib/libpython{major}.{minor}.dylib".format(**version_dict)],
             "@platforms//os:windows": [
                 "python3.dll",
                 "python{major}{minor}.dll".format(**version_dict),
                 "libs/python{major}{minor}.lib".format(**version_dict),
                 "libs/python3.lib",
             ],
+            "//conditions:default": [
+                "lib/libpython{major}.{minor}.so".format(**version_dict),
+                "lib/libpython{major}.{minor}.so.1.0".format(**version_dict),
+            ],
         }),
     )
 

python/private/internal_config_repo.bzl

@@ -22,7 +22,7 @@ load("//python/private:text_util.bzl", "render")
 load(":repo_utils.bzl", "repo_utils")
 
 _ENABLE_PIPSTAR_ENVVAR_NAME = "RULES_PYTHON_ENABLE_PIPSTAR"
-_ENABLE_PIPSTAR_DEFAULT = "1"
+_ENABLE_PIPSTAR_DEFAULT = "0"
 _ENABLE_DEPRECATION_WARNINGS_ENVVAR_NAME = "RULES_PYTHON_DEPRECATION_WARNINGS"
 _ENABLE_DEPRECATION_WARNINGS_DEFAULT = "0"
 

python/private/pypi/pip_repository.bzl

@@ -96,6 +96,7 @@ def _pip_repository_impl(rctx):
                 "linux_aarch64",
                 "linux_arm",
                 "linux_ppc",
+                "linux_riscv64",
                 "linux_s390x",
                 "linux_x86_64",
                 "osx_aarch64",