diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/release_notes.py | 3 | ||||
| -rw-r--r-- | tools/releasedate.py | 18 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tools/release_notes.py b/tools/release_notes.py index 7481cc18c3..973215b572 100755 --- a/tools/release_notes.py +++ b/tools/release_notes.py @@ -10,6 +10,7 @@ import os import getopt import subprocess + def run(cmd): proc = subprocess.Popen(cmd, stdout=subprocess.PIPE) rv = proc.communicate("")[0].decode("UTF-8") @@ -45,7 +46,7 @@ def main(argv): tag = run(["git", "describe", "--abbrev=0"]).strip("\n") chnglog = run( - ["git", "log", "--no-merges", "--pretty=format:'%s%d'", tag + ".." + branch] + ["git", "log", "--no-merges", "--pretty=format:'%s'", tag + ".." + branch] ) chnglog = chnglog.split("\n") diff --git a/tools/releasedate.py b/tools/releasedate.py index 37780501c3..3df1ea48fb 100644 --- a/tools/releasedate.py +++ b/tools/releasedate.py @@ -36,21 +36,23 @@ if __name__ == "__main__": print("Last release was (scheduled) on %s" % last.isoformat()) rel = upcoming.pop(0) - freeze, rc1, rc2 = rel - w2 * 3, rel - w2 * 2, rel - w2 + freeze, stabilization, rc = rel - w2 * 3, rel - w2 * 2, rel - w2 if now == rel: print("It's release day! 🎉") - elif now >= rc2: + elif now >= rc: print( - "%d days until release! (rc2 since %s)" - % ((rel - now).days, rc2.isoformat()) + "%d days until release! (RC since %s)" % ((rel - now).days, rc.isoformat()) + ) + elif now >= stabilization: + print( + "%d days until RC. (stabilization branch created since %s)" + % ((rc - now).days, stabilization.isoformat()) ) - elif now >= rc1: - print("%d days until rc2. (rc1 since %s)" % ((rc2 - now).days, rc1.isoformat())) elif now >= freeze: print( - "%d days until rc1, master is frozen since %s" - % ((rc1 - now).days, freeze.isoformat()) + "%d days until stabilization branch, master is frozen since %s" + % ((stabilization - now).days, freeze.isoformat()) ) else: print( |