Merge ubuntu-release-tools:schedule-clarity into ubuntu-release-tools:main

Proposed by Brian Murray
Status: Merged
Merged at revision: 16278429ff71217265bb74e4aea006a136b63a23
Proposed branch: ubuntu-release-tools:schedule-clarity
Merge into: ubuntu-release-tools:main
Diff against target: 43 lines (+12/-6)
1 file modified
generate-release-schedule-markdown (+12/-6)
Reviewer Review Type Date Requested Status
Iain Lane Approve
Ubuntu Release Team Pending
Review via email: mp+432314@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

This looks great, thank you!

Assuming you tested it and the output is correct 👍

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/generate-release-schedule-markdown b/generate-release-schedule-markdown
index ed31bb1..6e68392 100755
--- a/generate-release-schedule-markdown
+++ b/generate-release-schedule-markdown
@@ -108,7 +108,7 @@ After [Final Beta](https://wiki.ubuntu.com/FinalBetaRelease), all members of the
108 # October release108 # October release
109 nweeks = release_week_number - start_week_number109 nweeks = release_week_number - start_week_number
110 else:110 else:
111 nweeks = (52 - start_week_number + 1) + release_week_number111 nweeks = (52 - start_week_number) + release_week_number
112 # Week 1's Thursday is the Thursday AFTER the previous release112 # Week 1's Thursday is the Thursday AFTER the previous release
113 current_date = self.start_date + timedelta(weeks=1)113 current_date = self.start_date + timedelta(weeks=1)
114 last_month = None114 last_month = None
@@ -199,18 +199,24 @@ if __name__ == "__main__":
199 parser = argparse.ArgumentParser(199 parser = argparse.ArgumentParser(
200 description="Make a release schedule in markdown format"200 description="Make a release schedule in markdown format"
201 )201 )
202 parser.add_argument("codename", metavar="CODENAME", type=str)202 parser.add_argument("codename", metavar="CODENAME", type=str,
203 parser.add_argument("start", metavar="START", type=datetime.fromisoformat)203 help="Code name for the release"
204 )
205 parser.add_argument("previous_release_date", metavar="START",
206 type=datetime.fromisoformat, help="Release day of the previous release"
207 )
204 parser.add_argument(208 parser.add_argument(
205 "release", metavar="RELEASEDAY", type=datetime.fromisoformat209 "release", metavar="RELEASEDAY", type=datetime.fromisoformat,
210 help="Release day of this release"
206 )211 )
207 try:212 try:
208 args = parser.parse_args()213 args = parser.parse_args()
209214
210 raise_if_not_thursday(args.start)215 raise_if_not_thursday(args.previous_release_date)
211 raise_if_not_thursday(args.release)216 raise_if_not_thursday(args.release)
212217
213 sched = ReleaseSchedule(args.codename, args.start, args.release)218 sched = ReleaseSchedule(args.codename, args.previous_release_date,
219 args.release)
214 print(sched)220 print(sched)
215 except ValueError as e:221 except ValueError as e:
216 print(e, file=sys.stderr)222 print(e, file=sys.stderr)

Subscribers

People subscribed via source and target branches

to all changes: