advise PR labels in --review-pr and add support for --add-pr-labels

easybuild/framework/easyconfig/tools.py

@@ -47,14 +47,15 @@
 from easybuild.base import fancylogger
 from easybuild.framework.easyconfig import EASYCONFIGS_PKG_SUBDIR
 from easybuild.framework.easyconfig.easyconfig import EASYCONFIGS_ARCHIVE_DIR, ActiveMNS, EasyConfig
-from easybuild.framework.easyconfig.easyconfig import create_paths, get_easyblock_class, process_easyconfig
+from easybuild.framework.easyconfig.easyconfig import create_paths, det_file_info, get_easyblock_class
+from easybuild.framework.easyconfig.easyconfig import process_easyconfig
 from easybuild.framework.easyconfig.format.yeb import quote_yaml_special_chars
 from easybuild.framework.easyconfig.style import cmdline_easyconfigs_style_check
 from easybuild.tools.build_log import EasyBuildError, print_msg, print_warning
 from easybuild.tools.config import build_option
 from easybuild.tools.environment import restore_env
 from easybuild.tools.filetools import find_easyconfigs, is_patch_file, read_file, resolve_path, which, write_file
-from easybuild.tools.github import fetch_easyconfigs_from_pr, download_repo
+from easybuild.tools.github import download_repo, fetch_easyconfigs_from_pr, fetch_pr_data, post_pr_labels
 from easybuild.tools.multidiff import multidiff
 from easybuild.tools.py2vs3 import OrderedDict
 from easybuild.tools.toolchain.toolchain import is_system_toolchain
@@ -538,6 +539,28 @@ def review_pr(paths=None, pr=None, colored=True, branch='develop'):
         else:
             lines.extend(['', "(no related easyconfigs found for %s)\n" % os.path.basename(ec['spec'])])
 
+    labels = []
+    file_info = det_file_info(pr_files, download_repo_path)
+    if any(file_info['new_folder']):
+        labels.append('new')
+    if any(file_info['new_file_in_existing_folder']):
+        labels.append('update')
+
+    github_account = build_option('pr_target_account')
+    github_repo = build_option('pr_target_repo')
+    github_user = build_option('github_user')
+    pr_data, _ = fetch_pr_data(pr, github_account, github_repo, github_user)
+    pr_labels = [label['name'] for label in pr_data['labels']]
+
+    missing_labels = []
+    for label in labels:
+        if label not in pr_labels:
+            missing_labels.append(label)
+
+    if missing_labels:
+        if not post_pr_labels(pr, labels):
+            lines.extend(['', "This PR should be labeled %s" % ', '.join(missing_labels)])
+
     return '\n'.join(lines)
 
 

easybuild/tools/github.py

@@ -1271,6 +1271,42 @@ def merge_url(gh):
         print_warning("Review indicates this PR should not be merged (use -f/--force to do so anyway)")
 
 
+def post_pr_labels(pr, labels):
+    """
+    Update PR labels
+    """
+    pr_target_account = build_option('pr_target_account')
+    pr_target_repo = build_option('pr_target_repo')
+
+    # fetch GitHub token if available
+    github_user = build_option('github_user')
+    if github_user is None:
+        _log.info("GitHub user not specified, not adding labels to PR# %s" % pr)
+        return False
+
+    github_token = fetch_github_token(github_user)
+    if github_token is None:
+        _log.info("GitHub token for user '%s' not found, not adding labels to PR# %s" % (github_user, pr))
+        return False
+
+    dry_run = build_option('dry_run') or build_option('extended_dry_run')
+
+    if not dry_run:
+        g = RestClient(GITHUB_API_URL, username=github_user, token=github_token)
+
+        pr_url = g.repos[pr_target_account][pr_target_repo].issues[pr]
+        try:
+            status, data = pr_url.labels.post(body=labels)
+            if status == HTTP_STATUS_OK:
+                print_msg("Added labels %s to PR#%s" % (', '.join(labels), pr), log=_log, prefix=False)
+                return True
+        except HTTPError as err:
+            _log.info("Failed to add labels to PR# %s: %s." % (pr, err))
+            return False
+    else:
+        return True
+
+
 @only_if_module_is_available('git', pkgname='GitPython')
 def new_branch_github(paths, ecs, commit_msg=None):
     """
@@ -1479,15 +1515,9 @@ def new_pr_from_branch(branch_name, title=None, descr=None, pr_metadata=None):
         print_msg("Opened pull request: %s" % data['html_url'], log=_log, prefix=False)
 
         if labels:
-            # post labels
             pr = data['html_url'].split('/')[-1]
-            pr_url = g.repos[pr_target_account][pr_target_repo].issues[pr]
-            try:
-                status, data = pr_url.labels.post(body=labels)
-                if status == HTTP_STATUS_OK:
-                    print_msg("Added labels %s to PR#%s" % (', '.join(labels), pr), log=_log, prefix=False)
-            except HTTPError as err:
-                _log.info("Failed to add labels to PR# %s: %s." % (pr, err))
+            if not post_pr_labels(pr, labels):
+                print_msg("This PR should be labeled %s" % ', '.join(labels), log=_log, prefix=False)
 
 
 def new_pr(paths, ecs, title=None, descr=None, commit_msg=None):