Merge branch 'main' into feat/do-not-merge-check

Author: rickeylev

CHANGELOG.md

@@ -70,12 +70,12 @@ END_UNRELEASED_TEMPLATE
 ### Removed
 * Nothing removed.
 
-{#1-6-0}
+{#v1-6-0}
 ## [1.6.0] - 2025-08-23
 
 [1.6.0]: https://github.com/bazel-contrib/rules_python/releases/tag/1.6.0
 
-{#1-6-0-changed}
+{#v1-6-0-changed}
 ### Changed
 * (gazelle) update minimum gazelle version to 0.36.0 - may cause BUILD file changes
 * (gazelle) update minimum rules_go version to 0.55.1
@@ -107,7 +107,7 @@ END_UNRELEASED_TEMPLATE
 
 [20250808]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250808
 
-{#1-6-0-fixed}
+{#v1-6-0-fixed}
 ### Fixed
 * (toolchains) `local_runtime_repo` now respects changes to the `DEVELOPER_DIR` and `XCODE_VERSION`
   repo env vars, fixing stale cache issues on macOS with system (i.e. Xcode-supplied) Python
@@ -154,7 +154,7 @@ END_UNRELEASED_TEMPLATE
   ([#2797](https://github.com/bazel-contrib/rules_python/issues/2797)).
 * (py_wheel) Add directories in deterministic order.
 
-{#1-6-0-added}
+{#v1-6-0-added}
 ### Added
 * (repl) Default stub now has tab completion, where `readline` support is available,
   see ([#3114](https://github.com/bazel-contrib/rules_python/pull/3114)).
@@ -182,14 +182,16 @@ END_UNRELEASED_TEMPLATE
   dep is not added to the {obj}`py_test` target.
 * (gazelle) New directive `gazelle:python_generate_proto`; when `true`,
   Gazelle generates `py_proto_library` rules for `proto_library`. `false` by default.
+    * Note: Users must manually configure their Gazelle target to support the
+      proto language.
 * (gazelle) New directive `gazelle:python_proto_naming_convention`; controls
   naming of `py_proto_library` rules.
 
-{#1-6-0-removed}
+{#v1-6-0-removed}
 ### Removed
 * Nothing removed.
 
-{#1-5-3}
+{#v1-5-3}
 ## [1.5.3] - 2025-08-11
 
 [1.5.3]: https://github.com/bazel-contrib/rules_python/releases/tag/1.5.3
@@ -199,7 +201,7 @@ END_UNRELEASED_TEMPLATE
   before attempting to watch it, fixing issues on macOS with system Python
   ([#3043](https://github.com/bazel-contrib/rules_python/issues/3043)).
 
-{#1-5-2}
+{#v1-5-2}
 ## [1.5.2] - 2025-08-11
 
 [1.5.2]: https://github.com/bazel-contrib/rules_python/releases/tag/1.5.2
@@ -217,7 +219,7 @@ END_UNRELEASED_TEMPLATE
 * (core) builds work again on `7.x` `WORKSPACE` configurations
   ([#3119](https://github.com/bazel-contrib/rules_python/issues/3119)).
 
-{#1-5-1}
+{#v1-5-1}
 ## [1.5.1] - 2025-07-06
 
 [1.5.1]: https://github.com/bazel-contrib/rules_python/releases/tag/1.5.1
@@ -229,12 +231,12 @@ END_UNRELEASED_TEMPLATE
   by default again)
   ([#3038](https://github.com/bazel-contrib/rules_python/issues/3038)).
 
-{#1-5-0}
+{#v1-5-0}
 ## [1.5.0] - 2025-06-11
 
 [1.5.0]: https://github.com/bazel-contrib/rules_python/releases/tag/1.5.0
 
-{#1-5-0-changed}
+{#v1-5-0-changed}
 ### Changed
 
 * (toolchain) Bundled toolchain version updates:
@@ -255,7 +257,7 @@ END_UNRELEASED_TEMPLATE
 * (deps) Updated setuptools to 78.1.1 to patch CVE-2025-47273. This effectively makes
   Python 3.9 the minimum supported version for using `pip_parse`.
 
-{#1-5-0-fixed}
+{#v1-5-0-fixed}
 ### Fixed
 
 * (rules) PyInfo provider is now advertised by py_test, py_binary, and py_library;
@@ -284,7 +286,7 @@ END_UNRELEASED_TEMPLATE
 * (toolchains) The hermetic toolchains now correctly statically advertise the
   `releaselevel` and `serial` for pre-release hermetic toolchains ({gh-issue}`2837`).
 
-{#1-5-0-added}
+{#v1-5-0-added}
 ### Added
 * Repo utilities `execute_unchecked`, `execute_checked`, and `execute_checked_stdout` now
   support `log_stdout` and `log_stderr` keyword arg booleans. When these are `True`
@@ -307,11 +309,11 @@ END_UNRELEASED_TEMPLATE
   security patches.
 * (toolchains): 3.14.0b2 has been added as a preview.
 
-{#1-5-0-removed}
+{#v1-5-0-removed}
 ### Removed
 * Nothing removed.
 
-{#1-4-2}
+{#v1-4-2}
 ## [1.4.2] - 2025-08-13
 
 [1.4.2]: https://github.com/bazel-contrib/rules_python/releases/tag/1.4.2
@@ -321,23 +323,23 @@ END_UNRELEASED_TEMPLATE
   before attempting to watch it, fixing issues on macOS with system Python
   ([#3043](https://github.com/bazel-contrib/rules_python/issues/3043)).
 
-{#1-4-1}
+{#v1-4-1}
 ## [1.4.1] - 2025-05-08
 
 [1.4.1]: https://github.com/bazel-contrib/rules_python/releases/tag/1.4.1
 
-{#1-4-1-fixed}
+{#v1-4-1-fixed}
 ### Fixed
 * (pypi) Fix a typo not allowing users to benefit from using the downloader when the hashes in the
   requirements file are not present. Fixes
   [#2863](https://github.com/bazel-contrib/rules_python/issues/2863).
 
-{#1-4-0}
+{#v1-4-0}
 ## [1.4.0] - 2025-04-19
 
 [1.4.0]: https://github.com/bazel-contrib/rules_python/releases/tag/1.4.0
 
-{#1-4-0-changed}
+{#v1-4-0-changed}
 ### Changed
 * (toolchain) The `exec` configuration toolchain now has the forwarded
   `exec_interpreter` now also forwards the `ToolchainInfo` provider. This is
@@ -368,7 +370,7 @@ END_UNRELEASED_TEMPLATE
 
 [20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317
 
-{#1-4-0-fixed}
+{#v1-4-0-fixed}
 ### Fixed
 * (pypi) Platform specific extras are now correctly handled when using
   universal lock files with environment markers. Fixes [#2690](https://github.com/bazel-contrib/rules_python/pull/2690).
@@ -394,7 +396,7 @@ END_UNRELEASED_TEMPLATE
   {obj}`compile_pip_requirements` rule.
   See [#2819](https://github.com/bazel-contrib/rules_python/pull/2819).
 
-{#1-4-0-added}
+{#v1-4-0-added}
 ### Added
 * (pypi) From now on `sha256` values in the `requirements.txt` is no longer
   mandatory when enabling {attr}`pip.parse.experimental_index_url` feature.
@@ -425,7 +427,7 @@ END_UNRELEASED_TEMPLATE
   locations equivalents of `$(PYTHON2)` and `$(PYTHON3) respectively.
 
 
-{#1-4-0-removed}
+{#v1-4-0-removed}
 ### Removed
 * Nothing removed.
 

RELEASING.md

@@ -13,14 +13,10 @@ These are the steps for a regularly scheduled release from HEAD.
 ### Steps
 
 1. [Determine the next semantic version number](#determining-semantic-version).
-1. Update CHANGELOG.md: replace the `v0-0-0` and `0.0.0` with `X.Y.0`.
-   ```
-   awk -v version=X.Y.0 'BEGIN { hv=version; gsub(/\./, "-", hv) } /END_UNRELEASED_TEMPLATE/ { found_marker = 1 } found_marker { gsub(/v0-0-0/, hv, $0); gsub(/Unreleased/, "[" version "] - " strftime("%Y-%m-%d"), $0); gsub(/0.0.0/, version, $0); } { print } ' CHANGELOG.md > /tmp/changelog && cp /tmp/changelog CHANGELOG.md
-   ```
-1. Replace `VERSION_NEXT_*` strings with `X.Y.0`.
-   ```
-   grep -l --exclude=CONTRIBUTING.md --exclude=RELEASING.md --exclude-dir=.* VERSION_NEXT_ -r \
-     | xargs sed -i -e 's/VERSION_NEXT_FEATURE/X.Y.0/' -e 's/VERSION_NEXT_PATCH/X.Y.0/'
+1. Update the changelog and replace the version placeholders by running the
+   release tool:
+   ```shell
+   bazel run //tools/private/release -- X.Y.Z
    ```
 1. Send these changes for review and get them merged.
 1. Create a branch for the new release, named `release/X.Y`

gazelle/docs/directives.md

@@ -636,6 +636,30 @@ the configured name for the `@protobuf` / `@com_google_protobuf` repo in your
 `MODULE.bazel`, and otherwise falling back to `@com_google_protobuf` for
 compatibility with `WORKSPACE`.
 
+:::{note}
+In order to use this, you must manually configure Gazelle to target multiple
+languages. Place this in your root `BUILD.bazel` file:
+
+```
+load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
+
+gazelle_binary(
+    name = "gazelle_multilang",
+    languages = [
+        "@bazel_gazelle//language/proto",
+        # The python gazelle plugin must be listed _after_ the proto language.
+        "@rules_python_gazelle_plugin//python",
+    ],
+)
+
+gazelle(
+    name = "gazelle",
+    gazelle = "//:gazelle_multilang",
+)
+```
+:::
+
+
 For example, in a package with `# gazelle:python_generate_proto true` and a
 `foo.proto`, if you have both the proto extension and the Python extension
 loaded into Gazelle, you'll get something like:

gazelle/python/BUILD.bazel

@@ -70,6 +70,7 @@ gazelle_test(
     name = "python_test",
     srcs = ["python_test.go"],
     data = [
+        ":_gazelle_binary_with_proto",
         ":gazelle_binary",
     ],
     test_dirs = glob(
@@ -90,11 +91,18 @@ gazelle_test(
 
 gazelle_binary(
     name = "gazelle_binary",
+    languages = [":python"],
+    visibility = ["//visibility:public"],
+)
+
+# Only used by testing
+gazelle_binary(
+    name = "_gazelle_binary_with_proto",
     languages = [
         "@bazel_gazelle//language/proto",
         ":python",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//visibility:private"],
 )
 
 filegroup(

gazelle/python/python_test.go

@@ -38,7 +38,7 @@ import (
 const (
 	extensionDir      = "python" + string(os.PathSeparator)
 	testDataPath      = extensionDir + "testdata" + string(os.PathSeparator)
-	gazelleBinaryName = "gazelle_binary"
+	gazelleBinaryName = "_gazelle_binary_with_proto"
 )
 
 func TestGazelleBinary(t *testing.T) {

tests/tools/private/release/BUILD.bazel

@@ -0,0 +1,7 @@
+load("@rules_python//python:defs.bzl", "py_test")
+
+py_test(
+    name = "release_test",
+    srcs = ["release_test.py"],
+    deps = ["//tools/private/release"],
+)