From b7a5a1c1acaae8a19e171dfca89fc1024a7ebba6 Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Mon, 10 Mar 2025 21:50:25 +0000 Subject: [PATCH 1/6] (fix) Include YAML 'docstart' in gazelle manifest file --- gazelle/manifest/generate/generate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gazelle/manifest/generate/generate.go b/gazelle/manifest/generate/generate.go index 27cf2a21d8..899b1514ee 100644 --- a/gazelle/manifest/generate/generate.go +++ b/gazelle/manifest/generate/generate.go @@ -151,7 +151,7 @@ func writeOutput( } defer outputFile.Close() - if _, err := fmt.Fprintf(outputFile, "%s\n", header); err != nil { + if _, err := fmt.Fprintf(outputFile, "%s\n---\n", header); err != nil { return fmt.Errorf("failed to write output: %w", err) } From 1b3ba553cd4a44cc931f2f8fa94d032b689bb0dc Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Mon, 10 Mar 2025 22:07:52 +0000 Subject: [PATCH 2/6] Update examples --- examples/build_file_generation/gazelle_python.yaml | 1 + examples/bzlmod_build_file_generation/gazelle_python.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/examples/build_file_generation/gazelle_python.yaml b/examples/build_file_generation/gazelle_python.yaml index cd5904dcba..6b34f3c688 100644 --- a/examples/build_file_generation/gazelle_python.yaml +++ b/examples/build_file_generation/gazelle_python.yaml @@ -3,6 +3,7 @@ # To update this file, run: # bazel run //:gazelle_python_manifest.update +--- manifest: modules_mapping: alabaster: alabaster diff --git a/examples/bzlmod_build_file_generation/gazelle_python.yaml b/examples/bzlmod_build_file_generation/gazelle_python.yaml index c94f93a070..019b051092 100644 --- a/examples/bzlmod_build_file_generation/gazelle_python.yaml +++ b/examples/bzlmod_build_file_generation/gazelle_python.yaml @@ -3,6 +3,7 @@ # To update this file, run: # bazel run //:gazelle_python_manifest.update +--- manifest: modules_mapping: S3: s3cmd From c9c8644f21c2b88c9aa4038c9a90745d1a50a50e Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Mon, 10 Mar 2025 22:11:14 +0000 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e59d225189..6ba8f9b797 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,11 +55,13 @@ Unreleased changes template. * (deps) platforms 0.0.4 -> 0.0.11 * (py_wheel) Package `py_library.pyi_srcs` (`.pyi` files) in the wheel. * (py_package) Package `py_library.pyi_srcs` (`.pyi` files) in `py_package`. +* (gazelle) The generated manifest file (default: `gazelle_python.yaml`) will now include the + YAML document start `---` line. Implemented in [#x[(). {#v0-0-0-fixed} ### Fixed * (pypi) The `ppc64le` is now pointing to the right target in the `platforms` package. -* (gazelle) No longer incorrectly merge `py_binary` targets during partial updates in +* (gazelle) No longer incorrectly merge `py_binary` targets during partial updates in `file` generation mode. Fixed in [#2619](https://github.com/bazelbuild/rules_python/pull/2619). * (bzlmod) Running as root is no longer an error. `ignore_root_user_error=True` is now the default. Note that running as root may still cause spurious From 323815c21bf935ca7050c8cea8753b5a6fb7a15e Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Mon, 10 Mar 2025 22:18:20 +0000 Subject: [PATCH 4/6] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ba8f9b797..d7ae4bf0a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,7 +56,8 @@ Unreleased changes template. * (py_wheel) Package `py_library.pyi_srcs` (`.pyi` files) in the wheel. * (py_package) Package `py_library.pyi_srcs` (`.pyi` files) in `py_package`. * (gazelle) The generated manifest file (default: `gazelle_python.yaml`) will now include the - YAML document start `---` line. Implemented in [#x[(). + YAML document start `---` line. Implemented in + [#2656](https://github.com/bazelbuild/rules_python/pull/2656). {#v0-0-0-fixed} ### Fixed From 5b3be600c2d706d044966c5b112b16a39a890e79 Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Mon, 10 Mar 2025 22:53:14 +0000 Subject: [PATCH 5/6] missed one! --- .../bzlmod_build_file_generation/gazelle_python_with_types.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/bzlmod_build_file_generation/gazelle_python_with_types.yaml b/examples/bzlmod_build_file_generation/gazelle_python_with_types.yaml index b6b0687ea4..7632235aa0 100644 --- a/examples/bzlmod_build_file_generation/gazelle_python_with_types.yaml +++ b/examples/bzlmod_build_file_generation/gazelle_python_with_types.yaml @@ -3,6 +3,7 @@ # To update this file, run: # bazel run //:gazelle_python_manifest_with_types.update +--- manifest: modules_mapping: S3: s3cmd From 2a63f99fbffe70778eb1bb1fb2e84bf58df7ab93 Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Tue, 11 Mar 2025 01:47:34 +0000 Subject: [PATCH 6/6] empty commit to force CI trigger