Merge "Include TC E-mail addresses in roster"

This commit is contained in:
Zuul 2018-06-18 13:39:48 +00:00 committed by Gerrit Code Review
commit b676d5bcdf
2 changed files with 19 additions and 18 deletions

View File

@ -20,8 +20,8 @@ from docutils.parsers.rst import directives
from docutils.parsers.rst.directives import tables
from docutils.utils import SystemMessagePropagation
# Full name (IRC nickname) [expires in] {role}
_PATTERN = re.compile('(?P<name>.*)\s+\((?P<irc>.*)\)\s+\[(?P<date>.*)\](\s+\{(?P<role>.*)\})?')
# Full name (IRC) <E-mail> [expires in] {role}
_PATTERN = re.compile('(?P<name>.*)\s+\((?P<irc>.*)\)\s+\<(?P<email>.*)\>\s+\[(?P<date>.*)\](\s+\{(?P<role>.*)\})?')
def _parse_members_file(app, filename):
@ -44,10 +44,11 @@ class MembersTable(tables.Table):
"""Insert the members table using the referenced file as source.
"""
HEADERS = ('Full Name', 'IRC Nickname', 'Term Expires', 'Role')
HEADERS = ('Full Name', 'IRC', 'E-mail', 'Term Expires', 'Role')
HEADER_MAP = {
'Full Name': 'name',
'IRC Nickname': 'irc',
'IRC': 'irc',
'E-mail': 'email',
'Term Expires': 'date',
'Role': 'role',
}

View File

@ -1,14 +1,14 @@
# Full name (IRC nickname) [expires in] {role}
Chris Dent (cdent) [April 2019]
Davanum Srinivas (dims) [April 2019]
Colleen Murphy (cmurphy) [October 2018]
Doug Hellmann (dhellmann) [October 2018] {chair}
Emilien Macchi (emilienm) [October 2018]
Graham Hayes (mugsie) [April 2019]
Jeremy Stanley (fungi) [October 2018]
Julia Kreger (TheJulia) [October 2018]
Mohammed Naser (mnaser) [April 2019]
Paul Belanger (pabelanger) [October 2018]
Sean McGinnis (smcginnis) [April 2019]
Thierry Carrez (ttx) [April 2019]
Zane Bitter (zaneb) [April 2019]
# Full name (IRC) <E-mail> [expires in] {role}
Chris Dent (cdent) <cdent@anticdent.org> [April 2019]
Davanum Srinivas (dims) <davanum@gmail.com> [April 2019]
Colleen Murphy (cmurphy) <colleen@gazlene.net> [October 2018]
Doug Hellmann (dhellmann) <doug@doughellmann.com> [October 2018] {chair}
Emilien Macchi (emilienm) <emilien@redhat.com> [October 2018]
Graham Hayes (mugsie) <gr@ham.ie> [April 2019]
Jeremy Stanley (fungi) <fungi@yuggoth.org> [October 2018]
Julia Kreger (TheJulia) <juliaashleykreger@gmail.com> [October 2018]
Mohammed Naser (mnaser) <mnaser@vexxhost.com> [April 2019]
Paul Belanger (pabelanger) <pabelanger@redhat.com> [October 2018]
Sean McGinnis (smcginnis) <sean.mcginnis@gmail.com> [April 2019]
Thierry Carrez (ttx) <thierry@openstack.org> [April 2019]
Zane Bitter (zaneb) <zbitter@redhat.com> [April 2019]