This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch branch_10_1 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 3702672a000aebe67b76c7cf3eb784e909075f8d Author: Andrzej Białecki <[email protected]> AuthorDate: Wed Oct 21 15:44:38 2026 +0200 In dependencyChanges.py process also .yaml files and reoncile with entries from previous RCs. Co-authored-by: Claude Sonnet 5.5 <[email protected]>. (cherry picked from commit f38c4e2c1e42898efbea3d9b7764e5259ea0082a) --- dev-docs/changelog.adoc | 3 ++- dev-tools/scripts/dependencyChanges.py | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dev-docs/changelog.adoc b/dev-docs/changelog.adoc index 29121fa3ed7..aa65c924e97 100644 --- a/dev-docs/changelog.adoc +++ b/dev-docs/changelog.adoc @@ -278,7 +278,8 @@ Wizard but can also be run standalone. Run with `--help` for usage. since the previous release by diffing `solr/licenses/`. By default it prints to stdout; with `--write`, the Release Wizard uses it to write `dependency_update` changelog entries (one each for added, upgraded, and removed) and to delete the per-PR `dependency_update` -entries authored by `solrbot` from `changelog/unreleased/`, which the summary replaces. +entries authored by `solrbot` from `changelog/unreleased/` (and `changelog/vX.Y.Z/` if an earlier RC already +moved them there), which the summary replaces. == 7. Further Reading diff --git a/dev-tools/scripts/dependencyChanges.py b/dev-tools/scripts/dependencyChanges.py index bb2c49c0f1c..ed1cbf2c4a8 100644 --- a/dev-tools/scripts/dependencyChanges.py +++ b/dev-tools/scripts/dependencyChanges.py @@ -23,7 +23,7 @@ are listed together, since they are typically from the same project. Prints the summary to stdout, or with --write, writes changelog YAML entries and deletes the per-PR dependency_update entries authored by solrbot, which the summary -supersedes. +supersedes, from both unreleased/ and the version's folder if an earlier RC moved them there. This is a stopgap until Solr publishes an SBOM per release, which would be the better source to diff. @@ -180,7 +180,7 @@ def remove_solrbot_entries(directory): count = 0 for name in sorted(os.listdir(directory)): path = os.path.join(directory, name) - if (name.endswith('.yml') and not name.startswith('dependency-changes-') + if (name.endswith(('.yml', '.yaml')) and not name.startswith('dependency-changes-') and is_solrbot_dependency_entry(path)): os.remove(path) count += 1 @@ -219,6 +219,10 @@ def main(): os.remove(path) print(f'Removed {path}; no {category} dependency changes') remove_solrbot_entries(args.write) + # Entries already moved out of unreleased by an earlier RC's changelog prepare + released_dir = os.path.join(os.path.dirname(os.path.normpath(args.write)), f'v{version}') + if os.path.isdir(released_dir): + remove_solrbot_entries(released_dir) if __name__ == '__main__':
