Merge pull request #1340 from matrix-org/benparsons/prdefence

expect "#<pull-number>" or "/pull/<pull-number>" in PRs field
pull/977/head
Ben Parsons 6 years ago committed by GitHub
commit 1d019c3757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -68,7 +68,6 @@ for label in labels:
for item in issues[label]: for item in issues[label]:
# set the created date, find local field, otherwise Github # set the created date, find local field, otherwise Github
print(item)
body = str(item['body']) body = str(item['body'])
created = re.search('^Date: (.+?)\n', body, flags=re.MULTILINE) created = re.search('^Date: (.+?)\n', body, flags=re.MULTILINE)
if created is not None: if created is not None:
@ -138,17 +137,28 @@ for label in labels:
text_file.write(" - " + str(shepherd) + "\n") text_file.write(" - " + str(shepherd) + "\n")
# PRs # PRs
try:
pr_list = re.search('PRs: (.+?)$', str(item['body'])) pr_list = re.search('PRs: (.+?)$', str(item['body']))
if pr_list is not None: if pr_list is not None:
pr_list_formatted = set() pr_list_formatted = set()
pr_list = pr_list.group(1) pr_list = pr_list.group(1)
for p in pr_list.split(","): for p in pr_list.split(","):
if re.match(r"#\d", p.strip()):
prs.add(p.strip()) prs.add(p.strip())
pr_list_formatted.add("`PR" + str(p.strip()) + "`_") pr_list_formatted.add("`PR" + str(p.strip()) + "`_")
elif re.match(r"https://github.com/matrix-org/matrix-doc/pulls/\d", p.strip()):
pr = "#" + p.strip().replace('https://github.com/matrix-org/matrix-doc/pulls/', '')
prs.add(pr)
pr_list_formatted.add("`PR" + str(pr) + "`_")
else:
raise RuntimeWarning
text_file.write(" - " + ', '.join(pr_list_formatted)) text_file.write(" - " + ', '.join(pr_list_formatted))
text_file.write("\n") text_file.write("\n")
else: else:
text_file.write(" - \n") text_file.write(" - \n")
except:
print("exception parsing PRs for MSC" + str(item['number']))
text_file.write(" - \n")
text_file.write("\n\n\n") text_file.write("\n\n\n")

Loading…
Cancel
Save