Allow checking for backports via milestone

tools/backport_pr.py

@@ -32,6 +32,7 b' from gh_api import ('
     get_pull_request,
     get_pull_request_files,
     is_pull_request,
+    get_milestone_id,
 )
 
 def find_rejects(root='.'):
@@ -64,11 +65,11 b" def backport_pr(branch, num, project='ipython/ipython'):"
     else:
         req = urlopen(patch_url)
         patch = req.read()
-    
+
     msg = "Backport PR #%i: %s" % (num, title) + '\n\n' + description
     check = Popen(['git', 'apply', '--check', '--verbose'], stdin=PIPE)
     a,b = check.communicate(patch)
-    
+
     if check.returncode:
         print("patch did not apply, saving to {fname}".format(**locals()))
         print("edit {fname} until `cat {fname} | git apply --check` succeeds".format(**locals()))
@@ -77,24 +78,24 b" def backport_pr(branch, num, project='ipython/ipython'):"
             with open(fname, 'wb') as f:
                 f.write(patch)
         return 1
-    
+
     p = Popen(['git', 'apply'], stdin=PIPE)
     a,b = p.communicate(patch)
-    
+
     filenames = [ f['filename'] for f in files ]
 
     check_call(['git', 'add'] + filenames)
-    
+
     check_call(['git', 'commit', '-m', msg])
-    
+
     print("PR #%i applied, with msg:" % num)
     print()
     print(msg)
     print()
-    
+
     if branch != current_branch:
         check_call(['git', 'checkout', current_branch])
-    
+
     return 0
 
 backport_re = re.compile(r"[Bb]ackport.*?(\d+)")
@@ -107,18 +108,33 b' def already_backported(branch, since_tag=None):'
     lines = check_output(cmd).decode('utf8')
     return set(int(num) for num in backport_re.findall(lines))
 
-def should_backport(labels):
+def should_backport(labels=None, milestone=None):
     """return set of PRs marked for backport"""
-    issues = get_issues_list("ipython/ipython",
-            labels=labels,
-            state='closed',
-            auth=True,
-    )
+    if labels is None and milestone is None:
+        raise ValueError("Specify one of labels or milestone.")
+    elif labels is not None and milestone is not None:
+        raise ValueError("Specify only one of labels or milestone.")
+    if labels is not None:
+        issues = get_issues_list("ipython/ipython",
+                labels=labels,
+                state='closed',
+                auth=True,
+        )
+    else:
+        milestone_id = get_milestone_id("ipython/ipython", milestone,
+                auth=True)
+        issues = get_issues_list("ipython/ipython",
+                milestone=milestone_id,
+                state='closed',
+                auth=True,
+        )
+
     should_backport = set()
     for issue in issues:
         if not is_pull_request(issue):
             continue
-        pr = get_pull_request("ipython/ipython", issue['number'], auth=True)
+        pr = get_pull_request("ipython/ipython", issue['number'],
+                auth=True)
         if not pr['merged']:
             print ("Marked PR closed without merge: %i" % pr['number'])
             continue
@@ -126,11 +142,11 b' def should_backport(labels):'
     return should_backport
 
 if __name__ == '__main__':
-    
+
     if len(sys.argv) < 2:
         print(__doc__)
         sys.exit(1)
-    
+
     if len(sys.argv) < 3:
         branch = sys.argv[1]
         already = already_backported(branch)
@@ -139,5 +155,5 b" if __name__ == '__main__':"
         for pr in should.difference(already):
             print (pr)
         sys.exit(0)
-    
+
     sys.exit(backport_pr(sys.argv[1], int(sys.argv[2])))

tools/gh_api.py

@@ -32,28 +32,28 b' class Obj(dict):'
             return self[name]
         except KeyError:
             raise AttributeError(name)
-    
+
     def __setattr__(self, name, val):
         self[name] = val
 
 token = None
 def get_auth_token():
     global token
-    
+
     if token is not None:
         return token
-    
+
     import keyring
     token = keyring.get_password('github', fake_username)
     if token is not None:
         return token
-    
+
     print("Please enter your github username and password. These are not "
            "stored, only used to get an oAuth token. You can revoke this at "
            "any time on Github.")
     user = input("Username: ")
     pw = getpass.getpass("Password: ")
-    
+
     auth_request = {
       "scopes": [
         "public_repo",
@@ -88,13 +88,13 b" def post_gist(content, description='', filename='file', auth=False):"
         }
       }
     }).encode('utf-8')
-    
+
     headers = make_auth_header() if auth else {}
     response = requests.post("https://api.github.com/gists", data=post_data, headers=headers)
     response.raise_for_status()
     response_data = json.loads(response.text)
     return response_data['html_url']
-    
+
 def get_pull_request(project, num, auth=False):
     """get pull request info  by number
     """
@@ -156,6 +156,23 b' def get_issues_list(project, auth=False, **params):'
     pages = get_paged_request(url, headers=headers, **params)
     return pages
 
+def get_milestones(project, auth=False, **params):
+    url = "https://api.github.com/repos/{project}/milestones".format(project=project)
+    if auth:
+        headers = make_auth_header()
+    else:
+        headers = None
+    pages = get_paged_request(url, headers=headers, **params)
+    return pages
+
+def get_milestone_id(project, milestone, auth=False, **params):
+    pages = get_milestones(project, auth=auth, **params)
+    for page in pages:
+        if page['title'] == milestone:
+            return page['number']
+    else:
+        raise ValueError("milestone %s not found" % milestone)
+
 def is_pull_request(issue):
     """Return True if the given issue is a pull request."""
     return bool(issue.get('pull_request', {}).get('html_url', None))
@@ -233,16 +250,16 b' def post_download(project, filename, name=None, description=""):'
         name = os.path.basename(filename)
     with open(filename, 'rb') as f:
         filedata = f.read()
-    
+
     url = "https://api.github.com/repos/{project}/downloads".format(project=project)
-    
+
     payload = json.dumps(dict(name=name, size=len(filedata),
                     description=description))
     response = requests.post(url, data=payload, headers=make_auth_header())
     response.raise_for_status()
     reply = json.loads(response.content)
     s3_url = reply['s3_url']
-    
+
     fields = dict(
         key=reply['path'],
         acl=reply['acl'],