Skip to content

Commit 37a9b85

Browse files
authored
Merge branch 'main' into chore/drop-3.8
2 parents f14bea6 + 49b6630 commit 37a9b85

7 files changed

Lines changed: 118 additions & 254 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ BEGIN_UNRELEASED_TEMPLATE
3030
3131
{#v0-0-0-removed}
3232
### Removed
33+
* (toolchain) Remove all of the python 3.9 toolchain versions except for the `3.9.25`.
34+
This version has reached EOL and will no longer receive any security fixes, please update to
35+
`3.10` or above.
3336
34-
* Nothing removed.
3537
{#v0-0-0-changed}
3638
### Changed
37-
* Nothing changed.
39+
* (toolchains) Use toolchains from the [20251031] release.
3840
3941
{#v0-0-0-fixed}
4042
### Fixed
@@ -43,8 +45,9 @@ BEGIN_UNRELEASED_TEMPLATE
4345
4446
{#v0-0-0-added}
4547
### Added
46-
* Nothing added.
48+
* (toolchains) `3.9.25` Python toolchain from [20251031] release.
4749
50+
[20251031]: https://github.com/astral-sh/python-build-standalone/releases/tag/20251031
4851
4952
END_UNRELEASED_TEMPLATE
5053
-->

examples/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ lock(
2626
"--universal",
2727
"--python-version=3.9",
2828
],
29-
python_version = "3.9.19",
29+
python_version = "3.9",
3030
)
3131

3232
lock(

examples/bzlmod/MODULE.bazel

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ bazel_dep(name = "rules_java", version = "8.3.1")
2323
# MODULE.bazel.lock is cross-platform friendly, and there are transitive
2424
# dependencies on rules_rust, so we need rules_rust 0.54.1+ where such issues
2525
# were fixed.
26-
bazel_dep(name = "rules_rust", version = "0.54.1")
26+
bazel_dep(name = "rules_rust", version = "0.67.0")
2727

2828
# We next initialize the python toolchain using the extension.
2929
# You can set different Python versions in this block.
@@ -55,7 +55,6 @@ python.override(
5555
# require versions not listed here.
5656
# available_python_versions = [
5757
# "3.10.9",
58-
# "3.9.18",
5958
# "3.9.19",
6059
# # The following is used by the `other_module` and we need to include it here
6160
# # as well.
@@ -65,7 +64,7 @@ python.override(
6564
# instead of rules_python's defaulting to the latest available version,
6665
# controls what full version is used when `3.x` is requested.
6766
minor_mapping = {
68-
"3.9": "3.9.19",
67+
"3.9": "3.9.25",
6968
},
7069
)
7170

examples/pip_parse/MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ local_path_override(
99
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
1010
python.toolchain(
1111
# We can specify the exact version.
12-
python_version = "3.9.13",
12+
python_version = "3.9.25",
1313
)
1414

1515
# You can use this repo mapping to ensure that your BUILD.bazel files don't need
1616
# to be updated when the python version changes to a different `3.9` version.
1717
use_repo(
1818
python,
19-
python_3_9 = "python_3_9_13",
19+
python_3_9 = "python_3_9_25",
2020
)
2121

2222
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
@@ -34,7 +34,7 @@ pip.parse(
3434
},
3535
hub_name = "pypi",
3636
# We need to use the same version here as in the `python.toolchain` call.
37-
python_version = "3.9.13",
37+
python_version = "3.9.25",
3838
requirements_lock = "//:requirements_lock.txt",
3939
requirements_windows = "//:requirements_windows.txt",
4040
)

examples/pip_parse/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ py_repositories()
1111

1212
python_register_toolchains(
1313
name = "python_3_9",
14-
python_version = "3.9.13",
14+
python_version = "3.9.25",
1515
)
1616

1717
load("@rules_python//python:pip.bzl", "pip_parse")

python/versions.bzl

Lines changed: 104 additions & 243 deletions
Large diffs are not rendered by default.

tests/support/cc_toolchains/fake_cc_toolchain_config.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"""Fake for providing CcToolchainConfigInfo."""
1616

1717
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
18+
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
1819

1920
def _impl(ctx):
2021
return cc_common.create_cc_toolchain_config_info(

0 commit comments

Comments
 (0)