Merge the PR with one core dev approval and CI passed. (GH-51)

Allow miss-islington to merge the PR if all of these conditions met:
- All CI passed
- At least one core dev approved
- PR is made by miss-islington

Author: Mariatta

backport/delete_branch.py

@@ -15,7 +15,10 @@ async def delete_branch(event, gh, *args, **kwargs):
         if event.data["pull_request"]["merged"]:
             issue_number = event.data['pull_request']['number']
             merged_by = event.data['pull_request']['merged_by']['login']
-            util.comment_on_pr(issue_number, f"Thanks, @{merged_by}!")
+            if merged_by != "miss-islington":
+                util.comment_on_pr(issue_number, f"Thanks, @{merged_by}!")
+            else:
+                util.comment_on_pr(issue_number, "Thanks!")
 
         branch_name = event.data['pull_request']['head']['ref']
         util.delete_branch(branch_name)

backport/status_change.py

@@ -1,8 +1,6 @@
-import requests
-import os
 import re
 
-from gidgethub import sansio, routing
+from gidgethub import routing
 
 from . import util
 
@@ -11,7 +9,6 @@
 TITLE_RE = re.compile(r'\[(?P<branch>\d+\.\d+)\].+?(?P<pr>\d+)\)')
 
 
-
 @router.register("status")
 async def check_status(event, gh, *args, **kwargs):
     """
@@ -20,43 +17,86 @@ async def check_status(event, gh, *args, **kwargs):
     if event.data["commit"].get("committer") \
             and event.data["commit"]["committer"]["login"] == "miss-islington":
         sha = event.data["sha"]
-        status_url = f"https://api.github.com/repos/python/cpython/commits/{sha}/status"
-        request_headers = sansio.create_headers(
-            "miss-islington",
-            oauth_token=os.getenv('GH_AUTH'))
-        response = requests.get(status_url,
-                                 headers=request_headers)
-        result = response.json()
-        all_ci_status = [status["state"] for status in result["statuses"]]
-        all_ci_context = [status["context"] for status in result["statuses"]]
-        print(f"miss-islington's PR state changed: {all_ci_status}")
-        print(f"miss-islington's PR CI: {all_ci_context}")
-        if "pending" not in all_ci_status \
-                and "continuous-integration/travis-ci/pr" in all_ci_context:
-            url = "https://api.github.com/repos/miss-islington/cpython/git/refs/heads/"
-            response = requests.get(url, headers=request_headers)
-            for ref in response.json():
-                if "backport-" in ref["ref"] and ref["object"]["sha"] == sha:
-                    backport_branch_name = ref["ref"].split("/")[-1]
-                    pr_url = f"https://api.github.com/repos/python/cpython/pulls?state=open&head=miss-islington:{backport_branch_name}"
-                    pr_response = requests.get(pr_url, headers=request_headers).json()
-                    if pr_response:
-                        pr_number = pr_response[0]["number"]
-                        normalized_pr_title = util.normalize_title(pr_response[0]["title"],
-                                                                   pr_response[0]["body"])
-
-                        title_match = TITLE_RE.match(normalized_pr_title)
-                        if title_match:
+        await check_ci_status_and_approval(gh, sha, leave_comment=True)
+
+
+@router.register("pull_request_review", action="submitted")
+async def pr_reviewed(event, gh, *args, **kwargs):
+    if event.data["pull_request"]["user"]["login"] == "miss-islington":
+        reviewer = event.data["review"]["user"]["login"]
+        approved = event.data["review"]["state"] == "approved"
+        if approved and await util.is_core_dev(gh, reviewer):
+            sha = event.data["review"]["commit_id"]
+            await check_ci_status_and_approval(gh, sha)
+
+
+async def check_ci_status_and_approval(gh, sha, leave_comment=False):
+
+    result = await gh.getitem(f'/repos/python/cpython/commits/{sha}/status')
+    all_ci_status = [status["state"] for status in result["statuses"]]
+    all_ci_context = [status["context"] for status in result["statuses"]]
+
+    if "pending" not in all_ci_status \
+            and "continuous-integration/travis-ci/pr" in all_ci_context:
+        async for ref in gh.getiter('/repos/miss-islington/cpython/git/refs/heads/'):
+            if "backport-" in ref["ref"] and ref["object"]["sha"] == sha:
+                backport_branch_name = ref["ref"].split("/")[-1]
+                async for pr_response in gh.getiter(f'/repos/python/cpython/pulls?state=open&head=miss-islington:{backport_branch_name}'):
+                    pr_number = pr_response["number"]
+                    normalized_pr_title = util.normalize_title(
+                        pr_response["title"],
+                        pr_response["body"])
+
+                    title_match = TITLE_RE.match(normalized_pr_title)
+                    if title_match:
+
+                        if leave_comment:
                             original_pr_number = title_match.group('pr')
-                            original_pr_url = f"https://api.github.com/repos/python/cpython/pulls/{original_pr_number}"
-                            original_pr_result = requests.get(original_pr_url,
-                                                              headers=request_headers).json()
+                            original_pr_url = f"/repos/python/cpython/pulls/{original_pr_number}"
+                            original_pr_result = await gh.getitem(original_pr_url)
                             pr_author = original_pr_result["user"]["login"]
                             committer = original_pr_result["merged_by"]["login"]
 
                             participants = util.get_participants(
                                 pr_author, committer)
                             emoji = "✅" if result['state'] == "success" else "❌"
-                            util.comment_on_pr(
-                                pr_number,
+
+                            await comment_on_pr(gh,
+                                pr_number=pr_number,
                                 message=f"{participants}: Backport status check is done, and it's a {result['state']} {emoji} .")
+
+                            if result['state'] == "success":
+                                async for review in gh.getiter(f"/repos/python/cpython/pulls/{pr_number}/reviews"):
+                                    reviewer = review["user"]["login"]
+                                    approved = review["state"].lower() == "approved"
+                                    if approved \
+                                            and await util.is_core_dev(gh, reviewer):
+                                        await merge_pr(gh, pr_number, sha)
+                                        break
+
+
+async def merge_pr(gh, pr_number, sha):
+    async for commit in gh.getiter(f"/repos/python/cpython/pulls/{pr_number}/commits"):
+        if commit["sha"] == sha:
+            pr_commit_msg = commit["commit"]["message"].split("\n")
+
+            cleaned_up_title = f"{pr_commit_msg[0]} (GH-{pr_number})"
+            await gh.put(f"/repos/python/cpython/pulls/{pr_number}/merge",
+                   data={"commit_title": cleaned_up_title,
+                         "commit_message": "\n".join(pr_commit_msg[1:]),
+                         "sha": sha,
+                         "merge_method": "squash"
+                         }
+                   )
+            break
+
+
+async def comment_on_pr(gh, pr_number, message):
+    """
+    Leave a comment on a PR/Issue
+    """
+    issue_comment_url = f"/repos/python/cpython/issues/{pr_number}/comments"
+    data = {
+        "body": message,
+    }
+    await gh.post(issue_comment_url, data=data)

backport/util.py

@@ -2,6 +2,8 @@
 import os
 import subprocess
 
+import gidgethub
+
 from gidgethub import sansio
 
 
@@ -70,3 +72,26 @@ def normalize_title(title, body):
     else:
         # Being paranoid in case \r\n is used.
         return title[:-1] + body[1:].partition('\r\n')[0]
+
+# Copied over from https://github.com/python/bedevere
+async def is_core_dev(gh, username):
+    """Check if the user is a CPython core developer."""
+    org_teams = "/orgs/python/teams"
+    team_name = "python core"
+    async for team in gh.getiter(org_teams):
+        if team["name"].lower() == team_name:
+            break
+    else:
+        raise ValueError(f"{team_name!r} not found at {org_teams!r}")
+    # The 'teams' object only provides a URL to a deprecated endpoint,
+    # so manually construct the URL to the non-deprecated team membership
+    # endpoint.
+    membership_url = f"/teams/{team['id']}/memberships/{username}"
+    try:
+        await gh.getitem(membership_url)
+    except gidgethub.BadRequest as exc:
+        if exc.status_code == 404:
+            return False
+        raise
+    else:
+        return True