Merge pull request #3966 from branfosj/20220219115343_new_pr_BZXhcwUlrm

Only check for patches when using --new-pr if easyconfigs repository is target

Author: boegel

easybuild/tools/github.py

@@ -1783,13 +1783,15 @@ def new_pr(paths, ecs, title=None, descr=None, commit_msg=None):
     res = new_branch_github(paths, ecs, commit_msg=commit_msg)
     file_info, deleted_paths, _, branch_name, diff_stat, pr_target_repo = res
 
-    for ec, ec_path in zip(file_info['ecs'], file_info['paths_in_repo']):
-        for patch in ec.asdict()['patches']:
-            if isinstance(patch, tuple):
-                patch = patch[0]
-            if patch not in paths['patch_files'] and not os.path.isfile(os.path.join(os.path.dirname(ec_path), patch)):
-                print_warning("new patch file %s, referenced by %s, is not included in this PR" %
-                              (patch, ec.filename()))
+    if pr_target_repo == GITHUB_EASYCONFIGS_REPO:
+        for ec, ec_path in zip(file_info['ecs'], file_info['paths_in_repo']):
+            for patch in ec.asdict()['patches']:
+                if isinstance(patch, tuple):
+                    patch = patch[0]
+                if patch not in paths['patch_files'] and not os.path.isfile(os.path.join(os.path.dirname(ec_path),
+                                                                            patch)):
+                    print_warning("new patch file %s, referenced by %s, is not included in this PR" %
+                                  (patch, ec.filename()))
 
     new_pr_from_branch(branch_name, title=title, descr=descr, pr_target_repo=pr_target_repo,
                        pr_metadata=(file_info, deleted_paths, diff_stat), commit_msg=commit_msg)

test/framework/options.py

@@ -4568,6 +4568,37 @@ def test_github_new_pr_dependencies(self):
 
         self._assert_regexs(regexs, txt)
 
+    def test_new_pr_easyblock(self):
+        """
+        Test using --new-pr to open an easyblocks PR
+        """
+
+        if self.github_token is None:
+            print("Skipping test_new_pr_easyblock, no GitHub token available?")
+            return
+
+        topdir = os.path.dirname(os.path.abspath(__file__))
+        toy_eb = os.path.join(topdir, 'sandbox', 'easybuild', 'easyblocks', 't', 'toy.py')
+        self.assertTrue(os.path.exists(toy_eb))
+
+        args = [
+            '--github-user=%s' % GITHUB_TEST_ACCOUNT,
+            '--new-pr',
+            toy_eb,
+            '-D',
+        ]
+        txt, _ = self._run_mock_eb(args, do_build=True, raise_error=True, testing=False)
+
+        patterns = [
+            r'target: easybuilders/easybuild-easyblocks:develop',
+            r'from: easybuild_test/easybuild-easyblocks:[0-9]+_new_pr_toy',
+            r'title: "new easyblock for toy"',
+            r'easybuild/easyblocks/t/toy.py',
+        ]
+        for pattern in patterns:
+            regex = re.compile(pattern)
+            self.assertTrue(regex.search(txt), "Pattern '%s' should be found in: %s" % (regex.pattern, txt))
+
     def test_github_merge_pr(self):
         """
         Test use of --merge-pr (dry run)"""