diff --git a/CHANGES.rst b/CHANGES.rst index 7fb51323..6d736679 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,8 +4,9 @@ Changelog for zest.releaser 9.1.2 (unreleased) ------------------ -- Nothing changed yet. - +- Append the changes written in the change log file to the commit message. + This allows integration with GitHub releases. + Fixes issue #218 [gforcada] 9.1.1 (2023-10-11) ------------------ diff --git a/zest/releaser/baserelease.py b/zest/releaser/baserelease.py index 458e3ca0..6ba255d1 100644 --- a/zest/releaser/baserelease.py +++ b/zest/releaser/baserelease.py @@ -35,6 +35,7 @@ ), "history_last_release": ("Full text of all history entries of the current release"), "history_lines": "List with all history file lines (when found)", + "history_this_release": "The changes from the release being made", "name": "Name of the project being released", "new_version": "New version to write, possibly with development marker", "nothing_changed_yet": ( diff --git a/zest/releaser/prerelease.py b/zest/releaser/prerelease.py index cdb89d48..45223fa8 100644 --- a/zest/releaser/prerelease.py +++ b/zest/releaser/prerelease.py @@ -90,6 +90,7 @@ def execute(self): self._write_version() if self.data["update_history"]: self._write_history() + self.data["commit_msg"] += self.data["history_this_release"] self._diff_and_commit() def _grab_version(self, initial=False):