Init toolchain

Author: groodt

examples/bzlmod/BUILD.bazel

@@ -12,10 +12,6 @@ load("@python_versions//3.10:defs.bzl", compile_pip_requirements_3_10 = "compile
 load("@python_versions//3.9:defs.bzl", compile_pip_requirements_3_9 = "compile_pip_requirements")
 load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
 
-exports_files([
-    "requirements.in",
-])
-
 # This stanza calls a rule that generates targets for managing pip dependencies
 # with pip-compile.
 compile_pip_requirements_3_9(

examples/bzlmod/MODULE.bazel

@@ -94,7 +94,6 @@ use_repo(pip, "whl_mods_hub")
 # Alternatively, `python_interpreter_target` can be used to directly specify
 # the Python interpreter to run to resolve dependencies.
 pip.parse(
-    dependencies_file = ":requirements.in",
     # We can use `envsubst in the above
     envsubst = ["PIP_INDEX_URL"],
     # Use the bazel downloader to query the simple API for downloading the sources
@@ -149,7 +148,6 @@ pip.parse(
     },
 )
 pip.parse(
-    dependencies_file = ":requirements.in",
     experimental_requirement_cycles = {
         "sphinx": [
             "sphinx",

examples/bzlmod/other_module/BUILD.bazel

@@ -1,9 +1,5 @@
 load("@python_versions//3.11:defs.bzl", compile_pip_requirements_311 = "compile_pip_requirements")
 
-exports_files([
-    "requirements.in",
-])
-
 # NOTE: To update the requirements, you need to uncomment the rules_python
 # override in the MODULE.bazel.
 compile_pip_requirements_311(

python/BUILD.bazel

@@ -25,6 +25,7 @@ that @rules_python//python is only concerned with the core rules.
 
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//python/private:autodetecting_toolchain.bzl", "define_autodetecting_toolchain")
+load("//python/private/pypi:resolved_toolchain.bzl", "uv_resolved_toolchain")
 load(":current_py_toolchain.bzl", "current_py_toolchain")
 
 package(default_visibility = ["//visibility:public"])
@@ -348,7 +349,7 @@ toolchain_type(
     visibility = ["//visibility:public"],
 )
 
-resolved_toolchain(
+uv_resolved_toolchain(
     name = "uv_resolved_toolchain",
     # Marked manual so that `bazel test //...` passes
     # even if no toolchain is registered.

python/extensions.bzl

@@ -15,7 +15,7 @@ Overriding the default is only permitted in the root module.
 def _uv_toolchain_extension(module_ctx):
     registrations = {}
     for mod in module_ctx.modules:
-        for toolchain in mod.tags.uv_toolchain:
+        for toolchain in mod.tags.toolchain:
             if toolchain.name != _DEFAULT_NAME and not mod.is_root:
                 fail("""\
                 Only the root module may override the default name for the uv toolchain.

python/private/pypi/bzlmod.bzl

@@ -483,7 +483,6 @@ def _pip_impl(module_ctx):
             },
             default_version = _major_minor_version(DEFAULT_PYTHON_VERSION),
             groups = hub_group_map.get(hub_name),
-            dependencies_file = pip_attr.dependencies_file,  # buildifier: disable=uninitialized
         )
 
     if bazel_features.external_deps.extension_metadata_has_reproducible:
@@ -515,10 +514,6 @@ def _pip_parse_ext_attrs(**kwargs):
         A dict of attributes.
     """
     attrs = dict({
-        "dependencies_file": attr.label(
-            mandatory = True,
-            allow_single_file = [".in", ".toml"],
-        ),
         "experimental_extra_index_urls": attr.string_list(
             doc = """\
 The extra index URLs to use for downloading wheels using bazel downloader.

python/private/pypi/hub_repository.bzl

@@ -27,12 +27,6 @@ load("@rules_python//python/private:py_lock_dependencies.bzl", "py_lock_dependen
 
 # Ensure the `requirements.bzl` source can be accessed by stardoc, since users load() from it
 exports_files(["requirements.bzl"])
-
-py_lock_dependencies(
-    name = "lock",
-    dependencies_file = "{dependencies_file}",
-    visibility = ["//visibility:public"],
-)
 """
 
 def _impl(rctx):
@@ -55,9 +49,7 @@ def _impl(rctx):
     # `requirement`, et al. macros.
     macro_tmpl = "@@{name}//{{}}:{{}}".format(name = rctx.attr.name)
 
-    rctx.file("BUILD.bazel", _BUILD_FILE_CONTENTS.format(
-        dependencies_file = str(rctx.attr.dependencies_file),
-    ))
+    rctx.file("BUILD.bazel", _BUILD_FILE_CONTENTS)
     rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
         "%%ALL_DATA_REQUIREMENTS%%": render.list([
             macro_tmpl.format(p, "data")
@@ -76,26 +68,16 @@ def _impl(rctx):
 
 hub_repository = repository_rule(
     attrs = {
-        "constraints_file": attr.label(
-            allow_single_file = [".txt"],
-        ),
         "default_version": attr.string(
             mandatory = True,
             doc = """\
 This is the default python version in the format of X.Y. This should match
 what is setup by the 'python' extension using the 'is_default = True'
 setting.""",
         ),
-        "dependencies_file": attr.label(
-            mandatory = True,
-            allow_single_file = [".in", ".toml"],
-        ),
         "groups": attr.string_list_dict(
             mandatory = False,
         ),
-        "overrides_file": attr.label(
-            allow_single_file = [".txt"],
-        ),
         "repo_name": attr.string(
             mandatory = True,
             doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name.",

python/private/py_lock_dependencies.bzl renamed to python/private/pypi/py_lock_dependencies.bzl

@@ -15,7 +15,9 @@
 "Rule for locking third-party dependencies."
 
 def _py_lock_dependencies(ctx):
-    uv = ctx.toolchains["//python/private/uv:toolchain_type"].uv
+    info = ctx.toolchains["//python/:uv_toolchain_type"].uvtoolchaininfo
+    uv = info.uv_path
+
     python = ctx.toolchains["@bazel_tools//tools/python:toolchain_type"].py3_runtime.interpreter
     dependencies_file = ctx.file.dependencies_file