diff options
| -rwxr-xr-x | tools/announce.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/announce.py b/tools/announce.py index bbdf721ad..5b40cc3b0 100755 --- a/tools/announce.py +++ b/tools/announce.py @@ -58,12 +58,14 @@ A total of %d pull requests were merged for this release. """ def get_authors(revision_range): - pat = u'.*\\t(.*)\\n' + pat = u'^.*\\t(.*)$' lst_release, cur_release = [r.strip() for r in revision_range.split('..')] # authors, in current release and previous to current release. - cur = set(re.findall(pat, this_repo.git.shortlog('-s', revision_range))) - pre = set(re.findall(pat, this_repo.git.shortlog('-s', lst_release))) + cur = set(re.findall(pat, this_repo.git.shortlog('-s', revision_range), + re.M)) + pre = set(re.findall(pat, this_repo.git.shortlog('-s', lst_release), + re.M)) # Homu is the author of auto merges, clean him out. cur.discard('Homu') @@ -81,17 +83,17 @@ def get_pull_requests(repo, revision_range): # From regular merges merges = this_repo.git.log( '--oneline', '--merges', revision_range) - issues = re.findall(u"Merge pull request \#(\d*)", merges) + issues = re.findall(u"Merge pull request \\#(\\d*)", merges) prnums.extend(int(s) for s in issues) # From Homu merges (Auto merges) - issues = re. findall(u"Auto merge of \#(\d*)", merges) + issues = re. findall(u"Auto merge of \\#(\\d*)", merges) prnums.extend(int(s) for s in issues) # From fast forward squash-merges commits = this_repo.git.log( '--oneline', '--no-merges', '--first-parent', revision_range) - issues = re.findall(u'.*\(\#(\d+)\)\n', commits) + issues = re.findall(u'^.*\\(\\#(\\d+)\\)$', commits, re.M) prnums.extend(int(s) for s in issues) # get PR data from github repo @@ -111,7 +113,7 @@ def main(token, revision_range): heading = u"Contributors to {0}".format(cur_release) print() print(heading) - print(u"-"*len(heading)) + print(u"="*len(heading)) print(author_msg % len(authors)) for s in authors: @@ -122,14 +124,14 @@ def main(token, revision_range): heading = u"Pull requests merged for {0}".format(cur_release) print() print(heading) - print(u"-"*len(heading)) + print(u"="*len(heading)) print(pull_request_msg % len(pull_requests)) for pull in pull_requests: pull_msg = u"- `#{0} <{1}>`__: {2}" - title = re.sub(u"\s+", u" ", pull.title.strip()) + title = re.sub(u"\\s+", u" ", pull.title.strip()) if len(title) > 60: - remainder = re.sub(u"\s.*$", u"...", title[60:]) + remainder = re.sub(u"\\s.*$", u"...", title[60:]) if len(remainder) > 20: remainder = title[:80] + u"..." else: |