diff --git a/doc/source/index.rst b/doc/source/index.rst index 3c5813a6c..884fa52bd 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -20,7 +20,7 @@ Current Members =============== .. memberstable:: - :datafile: ../../reference/members + :datafile: ../../reference/members.yaml Reference documents and Resolutions =================================== diff --git a/openstack_governance/members.py b/openstack_governance/members.py index 072ef70bd..f16419bec 100644 --- a/openstack_governance/members.py +++ b/openstack_governance/members.py @@ -10,26 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -import logging -import re - -LOG = logging.getLogger(__name__) - -# Full name (IRC) [expires in] {role} -_PATTERN = re.compile('(?P.*)\s+\((?P.*)\)\s+\<(?P.*)\>\s+\[(?P.*)\](\s+\{(?P.*)\})?') +import yaml def parse_members_file(filename): """Load the members file and return each row as a dictionary. """ with open(filename, 'r') as f: - for linum, line in enumerate(f, 1): - line = line.strip() - if not line or line.startswith('#'): - continue - m = _PATTERN.match(line) - if not m: - LOG.warning('Could not parse line %d of %s: %r' % - (linum, filename, line)) - continue - yield m.groupdict() + return yaml.load(f) diff --git a/reference/members b/reference/members deleted file mode 100644 index 00e5a65f2..000000000 --- a/reference/members +++ /dev/null @@ -1,14 +0,0 @@ -# Full name (IRC) [expires in] {role} -Alexandra Settle (asettle) [March 2020] -Doug Hellmann (dhellmann) [October 2019] -Ghanshyam Mann (gmann) [October 2019] -Graham Hayes (mugsie) [March 2020] -Jean-Philippe Evrard (evrardjp) [October 2019] -Jeremy Stanley (fungi) [October 2019] -Jim Rollenhagen (jroll) [March 2020] -Julia Kreger (TheJulia) [October 2019] -Lance Bragstad (lbragstad) [October 2019] -Mohammed Naser (mnaser) [March 2020] {chair} -Rico Lin (ricolin) [March 2020] -Thierry Carrez (ttx) [March 2020] -Zane Bitter (zaneb) [March 2020] diff --git a/reference/members.yaml b/reference/members.yaml new file mode 100644 index 000000000..bdf9a9ff9 --- /dev/null +++ b/reference/members.yaml @@ -0,0 +1,77 @@ +- name: Alexandra Settle + irc: asettle + email: asettle@suse.com + date: March 2020 + role: null + +- name: Doug Hellmann + irc: dhellmann + email: doug@doughellmann.com + date: October 2019 + role: null + +- name: Ghanshyam Mann + irc: gmann + email: gmann@ghanshyammann.com + date: October 2019 + role: null + +- name: Graham Hayes + irc: mugsie + email: gr@ham.ie + date: March 2020 + role: null + +- name: Jean-Philippe Evrard + irc: evrardjp + email: jean-philippe@evrard.me + date: October 2019 + role: null + +- name: Jeremy Stanley + irc: fungi + email: fungi@yuggoth.org + date: October 2019 + role: null + +- name: Jim Rollenhagen + irc: jroll + email: jim@jimrollenhagen.com + date: March 2020 + role: null + +- name: Julia Kreger + irc: TheJulia + email: juliaashleykreger@gmail.com + date: October 2019 + role: null + +- name: Lance Bragstad + irc: lbragstad + email: lbragstad@gmail.com + date: October 2019 + role: null + +- name: Mohammed Naser + irc: mnaser + email: mnaser@vexxhost.com + date: March 2020 + role: chair + +- name: Rico Lin + irc: ricolin + email: rico.lin.guanyu@gmail.com + date: March 2020 + role: null + +- name: Thierry Carrez + irc: ttx + email: thierry@openstack.org + date: March 2020 + role: null + +- name: Zane Bitter + irc: zaneb + email: zbitter@redhat.com + date: March 2020 + role: null \ No newline at end of file diff --git a/tools/assign_liaisons.py b/tools/assign_liaisons.py index 6b0870635..320cdc4d5 100644 --- a/tools/assign_liaisons.py +++ b/tools/assign_liaisons.py @@ -26,7 +26,7 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument( '--member-file', - default='reference/members', + default='reference/members.yaml', help='location of members file, (%(default)s)', ) parser.add_argument( diff --git a/tools/check_review_status.py b/tools/check_review_status.py index 48e70ebdd..c1ebec216 100755 --- a/tools/check_review_status.py +++ b/tools/check_review_status.py @@ -428,7 +428,7 @@ def main(): tc_members = [ m.get('name') - for m in members.parse_members_file('./reference/members') + for m in members.parse_members_file('./reference/members.yaml') ] gov = governance.Governance.from_local_repo()