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
1diff --git a/generate-release-schedule-markdown b/generate-release-schedule-markdown
2index ed31bb1..6e68392 100755
3--- a/generate-release-schedule-markdown
4+++ b/generate-release-schedule-markdown
5@@ -108,7 +108,7 @@ After [Final Beta](https://wiki.ubuntu.com/FinalBetaRelease), all members of the
6 # October release
7 nweeks = release_week_number - start_week_number
8 else:
9- nweeks = (52 - start_week_number + 1) + release_week_number
10+ nweeks = (52 - start_week_number) + release_week_number
11 # Week 1's Thursday is the Thursday AFTER the previous release
12 current_date = self.start_date + timedelta(weeks=1)
13 last_month = None
14@@ -199,18 +199,24 @@ if __name__ == "__main__":
15 parser = argparse.ArgumentParser(
16 description="Make a release schedule in markdown format"
17 )
18- parser.add_argument("codename", metavar="CODENAME", type=str)
19- parser.add_argument("start", metavar="START", type=datetime.fromisoformat)
20+ parser.add_argument("codename", metavar="CODENAME", type=str,
21+ help="Code name for the release"
22+ )
23+ parser.add_argument("previous_release_date", metavar="START",
24+ type=datetime.fromisoformat, help="Release day of the previous release"
25+ )
26 parser.add_argument(
27- "release", metavar="RELEASEDAY", type=datetime.fromisoformat
28+ "release", metavar="RELEASEDAY", type=datetime.fromisoformat,
29+ help="Release day of this release"
30 )
31 try:
32 args = parser.parse_args()
33
34- raise_if_not_thursday(args.start)
35+ raise_if_not_thursday(args.previous_release_date)
36 raise_if_not_thursday(args.release)
37
38- sched = ReleaseSchedule(args.codename, args.start, args.release)
39+ sched = ReleaseSchedule(args.codename, args.previous_release_date,
40+ args.release)
41 print(sched)
42 except ValueError as e:
43 print(e, file=sys.stderr)

Subscribers

People subscribed via source and target branches

to all changes: