Merge branch 'main' into fix.py_runtime.missing_attrs

Author: rickeylev

CHANGELOG.md

@@ -60,13 +60,13 @@ END_UNRELEASED_TEMPLATE
 * (gazelle) Types for exposed members of `python.ParserOutput` are now all public.
 * (gazelle) Removed the requirement for `__init__.py`, `__main__.py`, or `__test__.py` files to be
   present in a directory to generate a `BUILD.bazel` file.
-* (toolchain) Updated the following toolchains to build 20250708 to patch CVE-2025-47273:
+* (toolchain) Updated the following toolchains to build [20250808] to patch CVE-2025-47273:
     * 3.9.23
     * 3.10.18
     * 3.11.13
     * 3.12.11
-    * 3.14.0b4
-* (toolchain) Python 3.13 now references 3.13.5
+    * 3.14.0rc1
+* (toolchain) Python 3.13 now references 3.13.6
 * (gazelle) Switched back to smacker/go-tree-sitter, fixing
   [#2630](https://github.com/bazel-contrib/rules_python/issues/2630)
 * (ci) We are now testing on Ubuntu 22.04 for RBE and non-RBE configurations.
@@ -75,6 +75,8 @@ END_UNRELEASED_TEMPLATE
   {gh-path}`gazelle/docs` and are now available on the primary documentation site
   at https://rules-python.readthedocs.io/en/latest/gazelle/docs/index.html
 
+[20250808]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250808
+
 {#v0-0-0-fixed}
 ### Fixed
 * (pypi) Fixes an issue where builds using a `bazel vendor` vendor directory
@@ -128,8 +130,8 @@ END_UNRELEASED_TEMPLATE
 * (toolchain) Add toolchains for aarch64 windows for
     * 3.11.13
     * 3.12.11
-    * 3.13.5
-    * 3.14.0b4
+    * 3.13.6
+    * 3.14.0rc1
 * (gazelle): New annotation `gazelle:include_pytest_conftest`. When not set (the
   default) or `true`, gazelle will inject any `conftest.py` file found in the same
   directory as a {obj}`py_test` target to that {obj}`py_test` target's `deps`.

docs/requirements.txt

@@ -297,9 +297,9 @@ requests==2.32.4 \
     # via
     #   readthedocs-sphinx-ext
     #   sphinx
-snowballstemmer==2.2.0 \
-    --hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \
-    --hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a
+snowballstemmer==3.0.1 \
+    --hash=sha256:6cd7b3897da8d6c9ffb968a6781fa6532dce9c3618a4b127d920dab764a19064 \
+    --hash=sha256:6d5eeeec8e9f84d4d56b847692bacf79bc2c8e90c7f80ca4444ff8b6f2e52895
     # via sphinx
 sphinx==8.1.3 \
     --hash=sha256:09719015511837b76bf6e03e42eb7595ac8c2e41eeb9c29c5b755c6b677992a2 \

python/private/hermetic_runtime_repo_setup.bzl

@@ -239,6 +239,7 @@ def define_hermetic_runtime_toolchain_impl(
     py_cc_toolchain(
         name = "py_cc_toolchain",
         headers = ":python_headers",
+        # TODO #3155: add libctl, libtk
         libs = ":libpython",
         python_version = python_version,
     )

python/versions.bzl

@@ -325,8 +325,8 @@ def _test_toolchain_ordering(env):
         "3.10": "3.10.18",
         "3.11": "3.11.13",
         "3.12": "3.12.11",
-        "3.13": "3.13.5",
-        "3.14": "3.14.0b4",
+        "3.13": "3.13.6",
+        "3.14": "3.14.0rc1",
         "3.8": "3.8.20",
         "3.9": "3.9.23",
     })

tests/python/python_tests.bzl

@@ -27,18 +27,14 @@ def test_expected_toolchain_matches(self):
         )
         self.assertIn(expected, settings["toolchain_label"], msg)
 
-        if sys.version_info.releaselevel == "final":
-            actual = "{v.major}.{v.minor}.{v.micro}".format(v=sys.version_info)
-        elif sys.version_info.releaselevel in ["beta"]:
-            actual = (
-                "{v.major}.{v.minor}.{v.micro}{v.releaselevel[0]}{v.serial}".format(
-                    v=sys.version_info
-                )
-            )
-        else:
-            raise NotImplementedError(
-                "Unsupported release level, please update the test"
+        actual = "{v.major}.{v.minor}.{v.micro}".format(v=sys.version_info)
+        if sys.version_info.releaselevel != "final":
+            release_prefix = (
+                "rc"
+                if sys.version_info.releaselevel == "candidate"
+                else sys.version_info.releaselevel[0]
             )
+            actual = f"{actual}{release_prefix}{sys.version_info.serial}"
         self.assertEqual(actual, expect_version)
 
 

tests/toolchains/python_toolchain_test.py

@@ -64,7 +64,7 @@ def _impl(ctx):
     if got_version.releaselevel != "final":
         got = "{}{}{}".format(
             got,
-            got_version.releaselevel[0],
+            "rc" if got_version.releaselevel == "candidate" else got_version.releaselevel[0],
             got_version.serial,
         )