Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ python = use_extension("//python/extensions:python.bzl", "python")
# NOTE: There must be a corresponding `python.toolchain()` call for the version
# specified here.
python.defaults(
python_version = "3.11",
python_version = "3.14",
)
python.toolchain(
python_version = "3.11",
python_version = "3.14",
)
use_repo(
python,
"python_3_11",
"python_3_14",
"pythons_hub",
python = "python_versions",
)
Expand All @@ -68,7 +68,7 @@ register_toolchains("@pythons_hub//:all")
pip = use_extension("//python/extensions:pip.bzl", "pip")
pip.parse(
hub_name = "rules_python_publish_deps",
python_version = "3.11",
python_version = "3.14",
requirements_by_platform = {
"//tools/publish:requirements_darwin.txt": "osx_*",
"//tools/publish:requirements_linux.txt": "linux_*",
Expand Down Expand Up @@ -215,17 +215,17 @@ dev_pip = use_extension(
dev_pip.parse(
download_only = True,
hub_name = "pypiserver",
python_version = "3.11",
python_version = "3.14",
requirements_lock = "//examples/wheel:requirements_server.txt",
)
dev_pip.parse(
hub_name = "pypi_alpha",
python_version = "3.11",
python_version = "3.14",
requirements_lock = "//tests/multi_pypi/alpha:requirements.txt",
)
dev_pip.parse(
hub_name = "pypi_beta",
python_version = "3.11",
python_version = "3.14",
requirements_lock = "//tests/multi_pypi/beta:requirements.txt",
)
use_repo(dev_pip, "dev_pip", "pypi", "pypi_alpha", "pypi_beta", "pypiserver")
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ py_repositories()

python_register_multi_toolchains(
name = "python",
default_version = "3.11",
default_version = "3.14",
# Integration tests verify each version, so register all of them.
python_versions = PYTHON_VERSIONS,
)
Expand Down Expand Up @@ -112,7 +112,7 @@ load("@rules_python_gazelle_plugin//:deps.bzl", _py_gazelle_deps = "gazelle_deps
_py_gazelle_deps()

# This interpreter is used for various rules_python dev-time tools
interpreter = "@python_3_11_9_host//:python"
interpreter = "@python_3_14_4_host//:python"

#####################
# Install twine for our own runfiles wheel publishing.
Expand Down
8 changes: 4 additions & 4 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ bazel_dep(name = "rules_python", version = "0.0.0")
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
hub_name = "pypi",
python_version = "3.11",
python_version = "3.14",
requirements_lock = "//:requirements.txt",
)
use_repo(pip, "pypi")
Expand Down Expand Up @@ -57,17 +57,17 @@ py_repositories()
load("@rules_python//python:repositories.bzl", "python_register_toolchains")

python_register_toolchains(
name = "python_3_11",
name = "python_3_14",
# Available versions are listed in @rules_python//python:versions.bzl.
# We recommend using the same version your team is already standardized on.
python_version = "3.11",
python_version = "3.14",
)

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

pip_parse(
name = "pypi",
python_interpreter_target = "@python_3_11_host//:python",
python_interpreter_target = "@python_3_14_host//:python",
requirements_lock = "//:requirements.txt",
)
```
Expand Down
4 changes: 2 additions & 2 deletions docs/toolchains.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ folder. Look for the examples that contain a `MODULE.bazel` file.

The `python.toolchain()` call makes its contents available under a repo named
`python_X_Y`, where X and Y are the major and minor versions. For example,
`python.toolchain(python_version="3.11")` creates the repo `@python_3_11`.
`python.toolchain(python_version="3.14")` creates the repo `@python_3_14`.
Remember to call `use_repo()` to make repos visible to your module:
`use_repo(python, "python_3_11")`.
`use_repo(python, "python_3_14")`.


:::{deprecated} 1.1.0
Expand Down
6 changes: 3 additions & 3 deletions python/extensions/python.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ The simplest way to configure the toolchain with `rules_python` is as follows.

```starlark
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
python.defaults(python_version = "3.11")
python.toolchain(python_version = "3.11")
use_repo(python, "python_3_11")
python.defaults(python_version = "3.14")
python.toolchain(python_version = "3.14")
use_repo(python, "python_3_14")
```

:::{seealso}
Expand Down
24 changes: 24 additions & 0 deletions python/private/pypi/whl_extract.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,30 @@ def whl_extract(rctx, *, whl_path, logger):
logger.debug(lambda: "Renaming: {} -> {}".format(src, dest))
repo_utils.rename(rctx, src, dest)

record_file = dist_info_dir.get_child("RECORD")
if record_file.exists:
record_content = rctx.read(record_file)
prefix_purelib = data_dir.basename + "/purelib/"
prefix_platlib = data_dir.basename + "/platlib/"
prefix_data = data_dir.basename + "/data/"
prefix_scripts = data_dir.basename + "/scripts/"
prefix_headers = data_dir.basename + "/headers/"

lines = []
for line in record_content.splitlines():
if line.startswith(prefix_purelib):
line = line[len(prefix_purelib):]
elif line.startswith(prefix_platlib):
line = line[len(prefix_platlib):]
elif line.startswith(prefix_data):
line = "../data/" + line[len(prefix_data):]
elif line.startswith(prefix_scripts):
line = "../bin/" + line[len(prefix_scripts):]
elif line.startswith(prefix_headers):
line = "../include/" + line[len(prefix_headers):]
lines.append(line)
rctx.file(record_file, "\n".join(lines) + "\n")

# Ensure that there is no data dir left
rctx.delete(data_dir)

Expand Down
6 changes: 3 additions & 3 deletions python/private/python.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1210,10 +1210,10 @@ In order to use a different name than the above, you can use the following `MODU
syntax:
```starlark
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
python.defaults(python_version = "3.11")
python.toolchain(python_version = "3.11")
python.defaults(python_version = "3.14")
python.toolchain(python_version = "3.14")

use_repo(python, my_python_name = "python_3_11")
use_repo(python, my_python_name = "python_3_14")
```

Then the python interpreter will be available as `my_python_name`.
Expand Down
6 changes: 3 additions & 3 deletions tests/cc/py_extension/py_extension/py_extension_tests.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def _test_static_deps_impl(env, target):
# The extension should be in PyInfo
env.expect.that_collection(py_info.transitive_sources.to_list()).has_size(1)
env.expect.that_depset_of_files(py_info.transitive_sources).contains_predicate(
matching.file_path_matches("ext_static.*311-*"),
matching.file_path_matches("ext_static.*314-*"),
)

def _test_static_deps(name):
Expand Down Expand Up @@ -64,7 +64,7 @@ def _test_dynamic_deps_impl(env, target):
# The extension should be in PyInfo
env.expect.that_collection(py_info.transitive_sources.to_list()).has_size(1)
env.expect.that_depset_of_files(py_info.transitive_sources).contains_predicate(
matching.file_path_matches("ext_shared.*311-*"),
matching.file_path_matches("ext_shared.*314-*"),
)

def _test_dynamic_deps(name):
Expand All @@ -80,7 +80,7 @@ def _test_musl_platform_impl(env, target):
env.expect.that_target(target).has_provider(PyInfo)
py_info = target[PyInfo]
env.expect.that_depset_of_files(py_info.transitive_sources).contains_predicate(
matching.file_path_matches("ext_static.*311-*"),
matching.file_path_matches("ext_static.*314-*"),
)

def _test_musl_platform(name):
Expand Down
8 changes: 4 additions & 4 deletions tests/deprecated/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load(
"@python//3.11:defs.bzl",
"@python//3.14:defs.bzl",
hub_compile_pip_requirements = "compile_pip_requirements",
hub_py_binary = "py_binary",
hub_py_console_script_binary = "py_console_script_binary",
hub_py_test = "py_test",
)
load(
"@python_3_11//:defs.bzl",
"@python_3_14//:defs.bzl",
versioned_compile_pip_requirements = "compile_pip_requirements",
versioned_py_binary = "py_binary",
versioned_py_console_script_binary = "py_console_script_binary",
Expand All @@ -21,14 +21,14 @@ transition_py_binary(
name = "transition_py_binary",
srcs = ["dummy.py"],
main = "dummy.py",
python_version = "3.11",
python_version = "3.14",
)

transition_py_test(
name = "transition_py_test",
srcs = ["dummy.py"],
main = "dummy.py",
python_version = "3.11",
python_version = "3.14",
)

versioned_py_binary(
Expand Down
2 changes: 1 addition & 1 deletion tests/deprecated/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.14
# by the following command:
#
# bazel run //tests/deprecated:versioned_compile_pip_requirements.update
Expand Down
2 changes: 1 addition & 1 deletion tests/deprecated/requirements_hub.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.14
# by the following command:
#
# bazel run //tests/deprecated:hub_compile_pip_requirements.update
Expand Down
2 changes: 1 addition & 1 deletion tests/interpreter/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ py_reconfig_interpreter_tests(
# Since we're grabbing the interpreter from a binary with a fixed
# version, we expect to always see that version. It doesn't matter what
# Python version the test itself is running with.
"EXPECTED_INTERPRETER_VERSION": "3.11",
"EXPECTED_INTERPRETER_VERSION": "3.14",
"PYTHON_BIN": "$(rootpath //python/bin:python)",
},
main = "interpreter_test.py",
Expand Down
2 changes: 1 addition & 1 deletion tests/multiple_inputs/multiple_inputs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.14
# by the following command:
#
# bazel run //tests/multiple_inputs:multiple_inputs.update
Expand Down
2 changes: 1 addition & 1 deletion tests/multiple_inputs/multiple_pyproject_toml.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.14
# by the following command:
#
# bazel run //tests/multiple_inputs:multiple_pyproject_toml.update
Expand Down
2 changes: 1 addition & 1 deletion tests/multiple_inputs/multiple_requirements_in.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.14
# by the following command:
#
# bazel run //tests/multiple_inputs:multiple_requirements_in.update
Expand Down
34 changes: 17 additions & 17 deletions tests/python/python_tests.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ def _rules_python_module(is_root = False):
"""A mock of what the real rules_python MODULE.bazel looks like."""
return python_ext.module(
name = "rules_python",
defaults = [python_ext.defaults(python_version = "3.11")],
toolchain = [python_ext.toolchain(python_version = "3.11")],
defaults = [python_ext.defaults(python_version = "3.14")],
toolchain = [python_ext.toolchain(python_version = "3.14")],
is_root = is_root,
)

Expand All @@ -51,11 +51,11 @@ def _test_default_from_rules_python_when_rules_python_is_root(env):
"tool_versions",
"platforms",
])
env.expect.that_str(py.default_python_version).equals("3.11")
env.expect.that_str(py.default_python_version).equals("3.14")

want_toolchain = struct(
name = "python_3_11",
python_version = "3.11",
name = "python_3_14",
python_version = "3.14",
register_coverage_tool = False,
)
env.expect.that_collection(py.toolchains).contains_exactly([want_toolchain])
Expand All @@ -71,11 +71,11 @@ def _test_default_from_rules_python_when_rules_python_is_not_root(env):
logger = repo_utils.logger(verbosity_level = 0, name = "python"),
)

env.expect.that_str(py.default_python_version).equals("3.11")
env.expect.that_str(py.default_python_version).equals("3.14")

want_toolchain = struct(
name = "python_3_11",
python_version = "3.11",
name = "python_3_14",
python_version = "3.14",
register_coverage_tool = False,
)
env.expect.that_collection(py.toolchains).contains_exactly([want_toolchain])
Expand Down Expand Up @@ -146,7 +146,7 @@ def _test_toolchain_ordering(env):
# the default match will be somewhere in the first bunch.
"3.10",
MINOR_MAPPING["3.10"],
"3.11",
"3.14",
MINOR_MAPPING["3.11"],
# Next, the rest, where we will match things based on the `python_version` being
# the same
Expand Down Expand Up @@ -284,8 +284,8 @@ def _test_defaults_overrides_single_toolchain(env):
python_ext.module(
name = "my_root_module",
defaults = [
# This relies on rules_python registering 3.11
python_ext.defaults(python_version = "3.11"),
# This relies on rules_python registering 3.14
python_ext.defaults(python_version = "3.14"),
],
is_root = True,
toolchain = [python_ext.toolchain(python_version = "3.12")],
Expand All @@ -294,7 +294,7 @@ def _test_defaults_overrides_single_toolchain(env):
),
logger = repo_utils.logger(verbosity_level = 0, name = "python"),
)
env.expect.that_str(py.default_python_version).equals("3.11")
env.expect.that_str(py.default_python_version).equals("3.14")

_tests.append(_test_defaults_overrides_single_toolchain)

Expand Down Expand Up @@ -359,8 +359,8 @@ def _test_first_occurance_of_the_toolchain_wins(env):
register_coverage_tool = False,
)
rules_python_toolchain = struct(
name = "python_3_11",
python_version = "3.11",
name = "python_3_14",
python_version = "3.14",
register_coverage_tool = False,
)
env.expect.that_collection(py.toolchains).contains_exactly([
Expand All @@ -371,7 +371,7 @@ def _test_first_occurance_of_the_toolchain_wins(env):
env.expect.that_dict(py.debug_info).contains_exactly({
"toolchains_registered": [
{"module": {"is_root": True, "name": "my_module"}, "name": "python_3_12"},
{"module": {"is_root": False, "name": "rules_python"}, "name": "python_3_11"},
{"module": {"is_root": False, "name": "rules_python"}, "name": "python_3_14"},
],
})

Expand Down Expand Up @@ -408,8 +408,8 @@ def _test_auth_overrides(env):
register_coverage_tool = False,
)
rules_python_toolchain = struct(
name = "python_3_11",
python_version = "3.11",
name = "python_3_14",
python_version = "3.14",
register_coverage_tool = False,
)
env.expect.that_collection(py.toolchains).contains_exactly([
Expand Down
2 changes: 1 addition & 1 deletion tests/toolchains/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ py_reconfig_test(
build_test(
name = "build_test",
targets = [
"@python_3_11//:python_headers",
"@python_3_14//:python_headers",
],
)

Expand Down
2 changes: 1 addition & 1 deletion tools/publish/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ py_console_script_binary(
# We transition to a specific python version in order to ensure that we
# don't rely on the default version configured by the root module.
pkg = "@rules_python_publish_deps//twine",
python_version = "3.11",
python_version = "3.14",
script = "twine",
visibility = ["//visibility:public"],
)
Expand Down