From f4b7e9411fa1c8452e9df428acf018c0ee3dd43a Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Sun, 12 May 2024 21:40:45 +0200 Subject: [PATCH 1/4] Mark internal deps extension as reproducible This avoids an unnecessary lockfile entry for users of rules_python. --- MODULE.bazel | 3 +-- python/private/bzlmod/internal_deps.bzl | 13 +++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2c325a6ef..d36210489 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_features", version = "1.9.1") -bazel_dep(name = "bazel_skylib", version = "1.3.0") +bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "platforms", version = "0.0.4") @@ -14,7 +14,6 @@ bazel_dep(name = "rules_proto", version = "6.0.0-rc1") bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf") internal_deps = use_extension("//python/private/bzlmod:internal_deps.bzl", "internal_deps") -internal_deps.install() use_repo( internal_deps, "rules_python_internal", diff --git a/python/private/bzlmod/internal_deps.bzl b/python/private/bzlmod/internal_deps.bzl index aadf2cc99..62ca71fec 100644 --- a/python/private/bzlmod/internal_deps.bzl +++ b/python/private/bzlmod/internal_deps.bzl @@ -8,18 +8,15 @@ "Python toolchain module extension for internal rule use" +load("@bazel_skylib//lib:modules.bzl", "modules") load("//python/pip_install:repositories.bzl", "pip_install_dependencies") load("//python/private:internal_config_repo.bzl", "internal_config_repo") -# buildifier: disable=unused-variable -def _internal_deps_impl(module_ctx): +def _internal_deps(): internal_config_repo(name = "rules_python_internal") pip_install_dependencies() -internal_deps = module_extension( - doc = "This extension to register internal rules_python dependecies.", - implementation = _internal_deps_impl, - tag_classes = { - "install": tag_class(attrs = dict()), - }, +internal_deps = modules.as_extension( + _internal_deps, + doc = "This extension registers internal rules_python dependencies.", ) From 186029c698740fd4a96210a368d5d3166e3dd38f Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 16 May 2024 10:45:50 +0200 Subject: [PATCH 2/4] Address comments --- CHANGELOG.md | 3 ++- gazelle/MODULE.bazel | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8745f537..386de8fae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,8 +25,9 @@ A brief description of the categories of changes: sorted in the attributes section. We are also removing values that are not default in order to reduce the size of the lock file. * (coverage) Bump `coverage.py` to [7.4.3](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst#version-743--2024-02-23). -* (deps): Bumped bazel_features to 1.9.1 to detect optional support +* (deps): Bumped `bazel_features` to 1.9.1 to detect optional support non-blocking downloads. +* (deps): Bumped `bazel_skylib` to 1.6.1 * (deps): Updated `pip_tools` to >= 7.4.0 ### Fixed diff --git a/gazelle/MODULE.bazel b/gazelle/MODULE.bazel index 1d01f49e1..6ae7719d4 100644 --- a/gazelle/MODULE.bazel +++ b/gazelle/MODULE.bazel @@ -4,7 +4,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "rules_python", version = "0.18.0") bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go") bazel_dep(name = "gazelle", version = "0.33.0", repo_name = "bazel_gazelle") From 9b8878a72f5ec8a4c0ae1dd4044d6ab9f5ebd1fb Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 16 May 2024 11:56:08 +0200 Subject: [PATCH 3/4] Also mark `python` extension as reproducible --- python/extensions/BUILD.bazel | 1 + python/private/bzlmod/BUILD.bazel | 2 +- python/private/bzlmod/python.bzl | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python/extensions/BUILD.bazel b/python/extensions/BUILD.bazel index a9dede44e..eb095ab74 100644 --- a/python/extensions/BUILD.bazel +++ b/python/extensions/BUILD.bazel @@ -37,6 +37,7 @@ bzl_library( visibility = ["//:__subpackages__"], deps = [ "//python/private:util_bzl", + "//python/private/bzlmod:bazel_features_bzl", "//python/private/bzlmod:python_bzl", ], ) diff --git a/python/private/bzlmod/BUILD.bazel b/python/private/bzlmod/BUILD.bazel index 0ec95e4be..9edd3380b 100644 --- a/python/private/bzlmod/BUILD.bazel +++ b/python/private/bzlmod/BUILD.bazel @@ -45,7 +45,7 @@ bzl_library( bzl_library( name = "bazel_features_bzl", - srcs = ["@bazel_features//:bzl_files"], + deps = ["@bazel_features//:features"], ) bzl_library( diff --git a/python/private/bzlmod/python.bzl b/python/private/bzlmod/python.bzl index 5862f00d7..f8be271fd 100644 --- a/python/private/bzlmod/python.bzl +++ b/python/private/bzlmod/python.bzl @@ -14,6 +14,7 @@ "Python toolchain module extensions for use with bzlmod" +load("@bazel_features//:features.bzl", "bazel_features") load("//python:repositories.bzl", "python_register_toolchains") load("//python/private:toolchains_repo.bzl", "multi_toolchain_aliases") load("//python/private:util.bzl", "IS_BAZEL_6_4_OR_HIGHER") @@ -230,6 +231,11 @@ def _python_impl(module_ctx): debug_info = json.encode_indent(debug_info), ) + if bazel_features.external_deps.extension_metadata_has_reproducible: + return module_ctx.extension_metadata(reproducible = True) + else: + return None + def _fail_duplicate_module_toolchain_version(version, module): fail(("Duplicate module toolchain version: module '{module}' attempted " + "to use version '{version}' multiple times in itself").format( From ed47c2ea7e53d49973099a0718750e6645f3379c Mon Sep 17 00:00:00 2001 From: aignas <240938+aignas@users.noreply.github.com> Date: Fri, 17 May 2024 11:44:34 +0900 Subject: [PATCH 4/4] Move the changelog item to the right spot and add a line on the changes to the lock file. --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5373bf6f9..3b0d52687 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,11 @@ A brief description of the categories of changes: ### Changed +* (deps): Bumped `bazel_skylib` to 1.6.1. +* (bzlmod): The `python` and internal `rules_python` extensions have been + marked as `reproducible` and will not include any lock file entries from now + on. + ### Fixed * (gazelle) Remove `visibility` from `NonEmptyAttr`. @@ -56,7 +61,6 @@ A brief description of the categories of changes: * (coverage) Bump `coverage.py` to [7.4.3](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst#version-743--2024-02-23). * (deps): Bumped `bazel_features` to 1.9.1 to detect optional support non-blocking downloads. -* (deps): Bumped `bazel_skylib` to 1.6.1 * (deps): Updated `pip_tools` to >= 7.4.0 * (toolchains): Change some old toolchain versions to use [20240224] release to include security fixes `3.8.18`, `3.9.18` and `3.10.13`