From 74682d973e0b3dc77b5f0072fe10b4e998e31fa8 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 15 Jun 2023 09:51:29 +0200 Subject: [PATCH 1/5] Avoid duplicates in changelog --- scripts/generate_changelog.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/generate_changelog.py b/scripts/generate_changelog.py index 13a215d2e8a5..a30f56e56ee5 100755 --- a/scripts/generate_changelog.py +++ b/scripts/generate_changelog.py @@ -109,6 +109,9 @@ def print_section(title: str, items: list[str]) -> None: def main() -> None: + # Because how we branch, we sometimes get duplicate commits in the changelog unless we check for it + previous_changelog = open("CHANGELOG.md").read() + repo = Repo(".") commits = list(repo.iter_commits(COMMIT_RANGE)) commits.reverse() # Most recent last @@ -149,13 +152,20 @@ def main() -> None: if pr_number is None: # Someone committed straight to main: summary = f"{title} [{hexsha}](https://github.com/{OWNER}/{REPO}/commit/{hexsha})" - misc.append(summary) + if summary in previous_changelog: + print(f"Ignoring dup: {summary}") + else: + misc.append(summary) else: title = pr_info.pr_title if pr_info else title # We prefer the PR title if available labels = pr_info.labels if pr_info else [] summary = f"{title} [#{pr_number}](https://github.com/{OWNER}/{REPO}/pull/{pr_number})" + if summary in previous_changelog: + print(f"Ignoring dup: {summary}") + continue + if INCLUDE_LABELS and 0 < len(labels): summary += f" ({', '.join(labels)})" From f96b447a540dcf21a54f8a1beeb8220458de7daf Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 15 Jun 2023 09:51:43 +0200 Subject: [PATCH 2/5] Add dates to all our releases in CHANGELOG.md --- CHANGELOG.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b08ea3dcfb77..7768ff01f0ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## [Unreleased](https://github.com/rerun-io/rerun/compare/latest...HEAD) -## [0.6.0](https://github.com/rerun-io/rerun/compare/v0.5.0...v0.6.0) - 3D in 2D and SDK batching +## [0.6.0](https://github.com/rerun-io/rerun/compare/v0.5.1...v0.6.0) - 3D in 2D and SDK batching - 2023-05-26 ### Overview & Highlights @@ -216,7 +216,8 @@ This Release fixes a few small bugs on top of the v0.5.0 release. * Don't use console.error [#1984](https://github.com/rerun-io/rerun/pull/1984) * Fix failure to save files when split table contains no data [#2007](https://github.com/rerun-io/rerun/pull/2007) -## [0.5.0](https://github.com/rerun-io/rerun/compare/v0.4.0...v0.5.0) - Jupyter MVP, GPU-based picking & colormapping, new datastore! + +## [0.5.0](https://github.com/rerun-io/rerun/compare/v0.4.0...v0.5.0) - Jupyter MVP, GPU-based picking & colormapping, new datastore! - 2023-04-20 ### Overview & Highlights @@ -387,10 +388,10 @@ This new release adds MVP support for embedding Rerun in Jupyter notebooks, and - `just rs-run-all` [b14087b40bd805c95f030a4c7d3fb7a0482e13f4](https://github.com/rerun-io/rerun/commit/b14087b40bd805c95f030a4c7d3fb7a0482e13f4) - `just py-run-all-{native|web|rrd}` [#1927](https://github.com/rerun-io/rerun/pull/1927) -## [0.4.0](https://github.com/rerun-io/rerun/compare/v0.3.1...v0.4.0) - Outlines, web viewer and performance improvements -https://user-images.githubusercontent.com/1220815/228241887-03b311e2-80e9-4541-9281-6d334a15ab04.mp4 +## [0.4.0](https://github.com/rerun-io/rerun/compare/v0.3.1...v0.4.0) - Outlines, web viewer and performance improvements - 2023-03-28 +https://user-images.githubusercontent.com/1220815/228241887-03b311e2-80e9-4541-9281-6d334a15ab04.mp4 ### Overview & Highlights * Add support for mesh vertex colors [#1671](https://github.com/rerun-io/rerun/pull/1671) @@ -562,12 +563,12 @@ We now host an experimental and unpolished web-viewer at - Lint fixes [9901e7c6735356b1970ddabc926bc5378d82e057](https://github.com/rerun-io/rerun/commit/9901e7c6735356b1970ddabc926bc5378d82e057) -## [0.3.1](https://github.com/rerun-io/rerun/compare/v0.3.0...v0.3.1) - Remove potentially sensitive analytics +## [0.3.1](https://github.com/rerun-io/rerun/compare/v0.3.0...v0.3.1) - Remove potentially sensitive analytics - 2023-03-13 Remove potentially sensitive analytics, including path to rerun source code on panics, and rerun branch name when building from source [#1563](https://github.com/rerun-io/rerun/pull/1563) -## [0.3.0](https://github.com/rerun-io/rerun/compare/v0.2.0...v0.3.0) +## [0.3.0](https://github.com/rerun-io/rerun/compare/v0.2.0...v0.3.0) - 2023-03-07 ### Overview & Highlights After a successful launch a couple of weeks ago, we're back with our second release! @@ -726,5 +727,5 @@ Meanwhile, we did a bunch of improvements to our manual. If you had trouble runn [Full Changelog](https://github.com/rerun-io/rerun/compare/v0.2.0...v0.3.0) -## 0.2.0 +## 0.2.0 - 2023-02-14 First public release! From c299416b0fcb921d1230f959b23128703d653b36 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 15 Jun 2023 12:08:01 +0200 Subject: [PATCH 3/5] Add @abey79 (Antoine) to the Rerun dev-list --- scripts/generate_changelog.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/generate_changelog.py b/scripts/generate_changelog.py index a30f56e56ee5..0b8e746b202b 100755 --- a/scripts/generate_changelog.py +++ b/scripts/generate_changelog.py @@ -22,6 +22,7 @@ COMMIT_RANGE = "latest..HEAD" INCLUDE_LABELS = False # It adds quite a bit of visual noise OFFICIAL_RERUN_DEVS = [ + "abey79" "emilk", "jleibs", "jprochazk", From 9fc8420dc744266cf0a1f8414a62d389fae26e7b Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 15 Jun 2023 12:10:39 +0200 Subject: [PATCH 4/5] Include a chronological list of all changes Useful when cherry-picking for a new patch release --- scripts/generate_changelog.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/generate_changelog.py b/scripts/generate_changelog.py index 0b8e746b202b..3f338f06f943 100755 --- a/scripts/generate_changelog.py +++ b/scripts/generate_changelog.py @@ -127,6 +127,8 @@ def main() -> None: ) ) + chronological = [] + # Sections: analytics = [] enhancement = [] @@ -155,8 +157,10 @@ def main() -> None: summary = f"{title} [{hexsha}](https://github.com/{OWNER}/{REPO}/commit/{hexsha})" if summary in previous_changelog: print(f"Ignoring dup: {summary}") - else: - misc.append(summary) + continue + + chronological.append(summary) + misc.append(summary) else: title = pr_info.pr_title if pr_info else title # We prefer the PR title if available labels = pr_info.labels if pr_info else [] @@ -167,6 +171,8 @@ def main() -> None: print(f"Ignoring dup: {summary}") continue + chronological.append(f"{summary} {hexsha}") + if INCLUDE_LABELS and 0 < len(labels): summary += f" ({', '.join(labels)})" @@ -221,6 +227,7 @@ def main() -> None: misc.append(summary) print() + # Most interesting first: print_section("🐍 Python SDK", python) print_section("🦀 Rust SDK", rust) @@ -239,6 +246,9 @@ def main() -> None: print_section("🗣 Refactors", refactor) print_section("🤷‍♂️ Other", misc) + print() + print_section("Chronological changes (don't include these)", chronological) + if __name__ == "__main__": main() From 3a49e2f8358ed2605d3459abca86d54a9814c26d Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 15 Jun 2023 12:15:07 +0200 Subject: [PATCH 5/5] Add missing comma --- scripts/generate_changelog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_changelog.py b/scripts/generate_changelog.py index 3f338f06f943..3a887688e041 100755 --- a/scripts/generate_changelog.py +++ b/scripts/generate_changelog.py @@ -22,7 +22,7 @@ COMMIT_RANGE = "latest..HEAD" INCLUDE_LABELS = False # It adds quite a bit of visual noise OFFICIAL_RERUN_DEVS = [ - "abey79" + "abey79", "emilk", "jleibs", "jprochazk",