Philipp Hörist pushed to branch master at gajim / gajim
Commits: e0b32d9e by lovetox at 2022-06-21T21:56:38+02:00 chore: Update git-chglog template - - - - - ebe34654 by lovetox at 2022-06-21T21:56:38+02:00 chore: Scripts: Generate changelog when using bump_version.py - - - - - 2 changed files: - .chglog/CHANGELOG.tpl.md - scripts/bump_version.py Changes: ===================================== .chglog/CHANGELOG.tpl.md ===================================== @@ -1,26 +1,11 @@ -{{ if .Versions -}} -<a name="unreleased"></a> -## [Unreleased] - -{{ if .Unreleased.CommitGroups -}} -{{ range .Unreleased.CommitGroups -}} -{{ .Title }} - -{{ range .Commits -}} - * {{if .Refs}}{{range .Refs}}#{{.Ref}} {{end}}{{end}}{{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} -{{ end }} -{{ end -}} -{{ end -}} -{{ end -}} - - {{ range .Versions }} -<a name="{{ .Tag.Name }}"></a> -## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }} +Gajim {{ .Tag.Name }} ({{ datetime "02 Jan 2006" .Tag.Date }}) + {{ range .CommitGroups -}} -{{ .Title }} +{{ if .Title }} {{ .Title }}{{end}} + {{ range .Commits -}} - * {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ if .Subject }} * {{ .Subject }}{{end}}{{if .Refs}} ({{range .Refs}}#{{.Ref}}{{end}}){{end}} {{ end }} {{ end -}} @@ -32,13 +17,7 @@ ## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - { {{ end }} {{ end -}} {{ end -}} -{{ end -}} -{{- if .Versions }} -[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD -{{ range .Versions -}} -{{ if .Tag.Previous -}} -[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }} -{{ end -}} +{{break}} + {{ end -}} -{{ end -}} \ No newline at end of file ===================================== scripts/bump_version.py ===================================== @@ -4,6 +4,7 @@ import argparse from datetime import datetime from pathlib import Path +import subprocess REPO_DIR = Path(__file__).resolve().parent.parent @@ -11,6 +12,7 @@ INIT = REPO_DIR / 'gajim' / '__init__.py' FLATPAK = REPO_DIR / 'flatpak' / 'org.gajim.Gajim.yaml' APPDATA = REPO_DIR / 'data' / 'org.gajim.Gajim.appdata.xml.in' +CHANGELOG = REPO_DIR / 'ChangeLog' VERSION_RX = r"\d+\.\d+\.\d+" @@ -61,6 +63,29 @@ def bump_appdata(new_version: str) -> None: f.write('\n') +def make_changelog(new_version: str) -> None: + + cmd = [ + 'git-chglog', + '--next-tag', + new_version + ] + + result = subprocess.run(cmd, + cwd=REPO_DIR, + text=True, + check=True, + capture_output=True) + + changes = result.stdout + changes = changes.removeprefix('\n') + + current_changelog = CHANGELOG.read_text() + + with CHANGELOG.open('w') as f: + f.write(changes + current_changelog) + + if __name__ == '__main__': parser = argparse.ArgumentParser(description='Bump Version') parser.add_argument('version', help='The new version, e.g. 1.5.0') @@ -70,3 +95,4 @@ def bump_appdata(new_version: str) -> None: bump_init(current_version, args.version) bump_flatpak(current_version, args.version) bump_appdata(args.version) + make_changelog(args.version) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec46547c3b0efb7a94b2b16e59571e2ce7d64562...ebe3465479a4903ff14dede4cda456ef36f28c7d -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec46547c3b0efb7a94b2b16e59571e2ce7d64562...ebe3465479a4903ff14dede4cda456ef36f28c7d You're receiving this email because of your account on dev.gajim.org.
_______________________________________________ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits