openstack/election
Code Issues Proposed changes

Correct upcoming release name in template URLs

Browse Source 
The future_release expansion variable was being incorrectly set to
the name of the end release from the electorate contribution
timeframe. Its intended use however was redundant with the release
variable. Remove future_release entirely and just use release in
those templates.

Change-Id: I7df3592112d543b52b06c99bfbc05107bfde45f8
This commit is contained in:
Jeremy Stanley 2019-03-04 16:17:09 +00:00
parent 423a00b48b
commit 23242b4b99
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstack_election/cmds/template_emails.py
View File

@ -23,7 +23,6 @@ template_names = ['election_season', 'nominations_kickoff',
fmt_args = dict( fmt_args = dict(
email_deadline=conf['timeframe']['email_deadline'], email_deadline=conf['timeframe']['email_deadline'],
end_release=end_release, end_release=end_release,
future_release=end_release.lower(),
last_release=end_release.lower(), last_release=end_release.lower(),
leaderless_url=LEADERLESS_URL, leaderless_url=LEADERLESS_URL,
reference_url=REFERENCE_URL, reference_url=REFERENCE_URL,
@ -113,7 +112,7 @@ Additional information about the nomination process can be found here:
https://governance.openstack.org/election/ https://governance.openstack.org/election/
Shortly after election officials approve candidates, they will be listed here: Shortly after election officials approve candidates, they will be listed here:
https://governance.openstack.org/election/#%(future_release)s-ptl-candidates https://governance.openstack.org/election/#%(release)s-ptl-candidates
The electorate is requested to confirm their email address in gerrit[1], The electorate is requested to confirm their email address in gerrit[1],
prior to %(email_deadline)s so that the emailed ballots are mailed to the correct email prior to %(email_deadline)s so that the emailed ballots are mailed to the correct email
@ -172,7 +171,7 @@ for those will be posted shortly after we setup the CIVS system.
Thank you, Thank you,
[0] http://governance.openstack.org/election/#%(future_release)s-ptl-candidates [0] http://governance.openstack.org/election/#%(release)s-ptl-candidates
[1] %(leaderless_url)s""" # noqa [1] %(leaderless_url)s""" # noqa
print(email_text % (fmt_args)) print(email_text % (fmt_args))
@ -207,7 +206,7 @@ please exercise your right to vote!
Candidate statements/platforms can be found linked to Candidate Candidate statements/platforms can be found linked to Candidate
names on this page: names on this page:
http://governance.openstack.org/election/#%(future_release)s-ptl-candidates http://governance.openstack.org/election/#%(release)s-ptl-candidates
Happy voting, Happy voting,
@ -414,7 +413,7 @@ Thank you,
at the email listed as your preferred email. That is where the ballot has at the email listed as your preferred email. That is where the ballot has
been sent. been sent.
[5] http://governance.openstack.org/election/#election-officials [5] http://governance.openstack.org/election/#election-officials
[6] http://governance.openstack.org/election/#%(future_release)s-tc-candidates""" # noqa [6] http://governance.openstack.org/election/#%(release)s-tc-candidates""" # noqa
print(email_text % (fmt_args)) print(email_text % (fmt_args))
@ -432,7 +431,7 @@ vote. If you have voted, please encourage your colleagues to vote.
Candidate statements are linked to the names of all confirmed Candidate statements are linked to the names of all confirmed
candidates: candidates:
http://governance.openstack.org/election/#%(future_release)s-tc-candidates http://governance.openstack.org/election/#%(release)s-tc-candidates
What to do if you don't see the email and have a commit in at least What to do if you don't see the email and have a commit in at least
one of the official programs projects[1]: one of the official programs projects[1]: