openstack/election
Code Issues Proposed changes

Merge "Consistent HTTPS for URLs in non-historical files"

Browse Source
This commit is contained in:
Zuul 2019-03-06 06:47:47 +00:00 committed by Gerrit Code Review
commit 7311baf778
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/conf.py
View File

@ -39,7 +39,7 @@ todo_include_todos = True
# Define shorthand roles for making links to common destinations. # Define shorthand roles for making links to common destinations.
extlinks = { extlinks = {
'repo': ('http://git.openstack.org/cgit/%s', ''), 'repo': ('https://git.openstack.org/cgit/%s', ''),
} }
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.

2
doc/source/index.rst
View File

@ -75,7 +75,7 @@ self-nominated by other means.
If you are not already familiar with OpenStack development workflow, see this If you are not already familiar with OpenStack development workflow, see this
more detailed documentation: more detailed documentation:
http://docs.openstack.org/infra/manual/developers.html https://docs.openstack.org/infra/manual/developers.html
Candidacies now need to be submitted as a text file to the openstack/election Candidacies now need to be submitted as a text file to the openstack/election
repository. Here are the required steps: repository. Here are the required steps:

32
openstack_election/cmds/template_emails.py
View File

@ -11,7 +11,7 @@ from openstack_election import utils
conf = config.load_conf() conf = config.load_conf()
REFERENCE_URL = '%s?id=%s' % (utils.PROJECTS_URL, conf['tag']) REFERENCE_URL = '%s?id=%s' % (utils.PROJECTS_URL, conf['tag'])
LEADERLESS_URL = ('http://governance.openstack.org/resolutions/' LEADERLESS_URL = ('https://governance.openstack.org/resolutions/'
'20141128-elections-process-for-leaderless-programs.html') '20141128-elections-process-for-leaderless-programs.html')
time_frame = "%(start_str)s - %(end_str)s" % (conf['timeframe']) time_frame = "%(start_str)s - %(end_str)s" % (conf['timeframe'])
@ -96,7 +96,7 @@ and will remain open until %(end_nominations)s.
All nominations must be submitted as a text file to the All nominations must be submitted as a text file to the
openstack/election repository as explained at openstack/election repository as explained at
http://governance.openstack.org/election/#how-to-submit-a-candidacy https://governance.openstack.org/election/#how-to-submit-a-candidacy
Please make sure to follow the new candidacy file naming Please make sure to follow the new candidacy file naming
convention: candidates/<cycle>/<project_name>/<email_address>. convention: candidates/<cycle>/<project_name>/<email_address>.
@ -148,7 +148,7 @@ described by [3].
Thank you, Thank you,
[1] http://governance.openstack.org/election/#how-to-submit-a-candidacy [1] https://governance.openstack.org/election/#how-to-submit-a-candidacy
[2] Any open reviews at [2] Any open reviews at
https://review.openstack.org/#/q/is:open+project:openstack/election https://review.openstack.org/#/q/is:open+project:openstack/election
have not been factored into these stats. have not been factored into these stats.
@ -171,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/#%(release)s-ptl-candidates [0] https://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))
@ -206,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/#%(release)s-ptl-candidates https://governance.openstack.org/election/#%(release)s-ptl-candidates
Happy voting, Happy voting,
@ -300,12 +300,12 @@ mailing list or to the elections officials[6].
Thank you, Thank you,
[1] http://governance.openstack.org/election/#how-to-submit-a-candidacy [1] https://governance.openstack.org/election/#how-to-submit-a-candidacy
[2] http://www.openstack.org/community/members/ [2] https://www.openstack.org/community/members/
[3] https://governance.openstack.org/tc/reference/projects/ [3] https://governance.openstack.org/tc/reference/projects/
[4] https://releases.openstack.org/%(last_release)s/schedule.html#p-extra-atcs [4] https://releases.openstack.org/%(last_release)s/schedule.html#p-extra-atcs
[5] https://governance.openstack.org/election/ [5] https://governance.openstack.org/election/
[6] http://governance.openstack.org/election/#election-officials""" # noqa [6] https://governance.openstack.org/election/#election-officials""" # noqa
print(email_text % (fmt_args)) print(email_text % (fmt_args))
@ -324,7 +324,7 @@ openstack/election repository and approved by election officials.
Thank you, Thank you,
[1] http://governance.openstack.org/election/#how-to-submit-a-candidacy""" [1] https://governance.openstack.org/election/#how-to-submit-a-candidacy"""
print(email_text % (fmt_args)) print(email_text % (fmt_args))
@ -340,7 +340,7 @@ Polling will start %(election_start)s.
Thank you, Thank you,
[0] http://governance.openstack.org/election/#%(release)s-tc-candidates""" [0] https://governance.openstack.org/election/#%(release)s-tc-candidates"""
print(email_text % (fmt_args)) print(email_text % (fmt_args))
@ -367,7 +367,7 @@ concern, and the electorate has the best information to determine the ideal
TC composition to address these and other issues that may arise. TC composition to address these and other issues that may arise.
[1] https://governance.openstack.org/election/ [1] https://governance.openstack.org/election/
[2] http://git.openstack.org/cgit/openstack/election/tree/candidates/%(release)s/TC [2] https://git.openstack.org/cgit/openstack/election/tree/candidates/%(release)s/TC
""" # noqa """ # noqa
print(email_text % (fmt_args)) print(email_text % (fmt_args))
@ -406,14 +406,14 @@ Happy voting!
Thank you, Thank you,
[1] http://www.openstack.org/community/members/ [1] https://www.openstack.org/community/members/
[2] %(reference_url)s [2] %(reference_url)s
[3] Look for the extra-atcs element in [2] [3] Look for the extra-atcs element in [2]
[4] Sign into review.openstack.org: Go to Settings > Contact Information. Look [4] Sign into review.openstack.org: Go to Settings > Contact Information. Look
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] https://governance.openstack.org/election/#election-officials
[6] http://governance.openstack.org/election/#%(release)s-tc-candidates""" # noqa [6] https://governance.openstack.org/election/#%(release)s-tc-candidates""" # noqa
print(email_text % (fmt_args)) print(email_text % (fmt_args))
@ -431,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/#%(release)s-tc-candidates https://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]:
@ -452,7 +452,7 @@ Thank you,
Information. Look at the email listed as your Preferred Email. Information. Look at the email listed as your Preferred Email.
That is where the ballot has been sent. That is where the ballot has been sent.
[1] %(reference_url)s [1] %(reference_url)s
[2] http://governance.openstack.org/election/#election-officials""" [2] https://governance.openstack.org/election/#election-officials"""
print(email_text % (fmt_args)) print(email_text % (fmt_args))

2
openstack_election/utils.py
View File

@ -94,7 +94,7 @@ def load_yaml(yaml_stream):
def get_from_cgit(project, obj, params={}): def get_from_cgit(project, obj, params={}):
"""Retrieve a file from the cgit interface""" """Retrieve a file from the cgit interface"""
url = 'http://git.openstack.org/cgit/' + project + '/plain/' + obj url = 'https://git.openstack.org/cgit/' + project + '/plain/' + obj
raw = requester(url, params=params, raw = requester(url, params=params,
headers={'Accept': 'application/json'}) headers={'Accept': 'application/json'})
return load_yaml(raw.text) return load_yaml(raw.text)

2
setup.cfg
View File

@ -4,7 +4,7 @@ summary = OpenStack Election Documents
description-file = README.rst description-file = README.rst
author = OpenStack Election Officials author = OpenStack Election Officials
author-email = openstack-discuss@lists.openstack.org author-email = openstack-discuss@lists.openstack.org
home-page = http://www.openstack.org/ home-page = https://governance.openstack.org/election/
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology

2
tools/tc-election-summary.py
View File

@ -17,7 +17,7 @@ from __future__ import print_function
import prettytable import prettytable
CIVS_BASE = 'http://civs.cs.cornell.edu/cgi-bin/results.pl' CIVS_BASE = 'https://civs.cs.cornell.edu/cgi-bin/results.pl'
data = [ data = [
{ {
'election': '10/2013', # Icehouse 'election': '10/2013', # Icehouse