Minor test suite modifications (#124)

* minor modifications from pkg branch

* remove rose_orig_host from table

* set all as main

* wrong branch name

Author: james-bruten-mo

github_scripts/suite_data.py

@@ -176,10 +176,7 @@ def populate_gitbdiff(self) -> None:
 
         for dependency, data in self.dependencies.items():
             if not data["gitinfo"].is_main():
-                if dependency.lower() == "simsys_scripts":
-                    parent = "main"
-                else:
-                    parent = "trunk"
+                parent = "main"
                 self.dependencies[dependency]["gitbdiff"] = GitBDiff(
                     repo=self.temp_directory / dependency, parent=parent
                 ).files()

github_scripts/suite_report_git.py

@@ -123,7 +123,6 @@ def create_suite_info_table(self) -> None:
             ("Suite User", self.suite_user),
             ("Workflow Start", self.suite_starttime),
             ("Groups Run", ",".join(g for g in self.groups)),
-            ("ROSE_ORIG_HOST", self.rose_data["ROSE_ORIG_HOST"]),
         )
 
         for row in rows:

script_copyright_checker/bin/copyright_checker.py

@@ -13,14 +13,6 @@
 import re
 from textwrap import wrap
 
-from fcm_bdiff import (
-    get_branch_diff_filenames,
-    get_branch_info,
-    get_url,
-    is_trunk,
-    use_mirror,
-)
-
 # Desired maximum column width for output - we make an exception
 # for filenames, which are always printed on a single line to aid
 # ease of selection by the user
@@ -220,12 +212,6 @@ def parse_options():
             "run on use the full file list when trunk, " "else run on fcm branch-diff"
         ),
     )
-    excl_group.add_argument(
-        "--bdiff",
-        action="store_true",
-        default=False,
-        help="run on an fcm branch-diff",
-    )
     excl_group.add_argument(
         "files",
         nargs="*",
@@ -234,26 +220,6 @@ def parse_options():
     )
     args = parser.parse_args()
 
-    if args.full_trunk:
-        branch, retries = use_mirror("./")
-
-        # Get information about the branch
-        info = get_branch_info(branch, retries=retries)
-
-        branch_url = get_url(info)
-
-        if is_trunk(branch_url):
-            args.bdiff = False
-        else:
-            args.bdiff = True
-
-    if args.bdiff:
-        # Filter the files returned by fcm bdiff to just the *.py ones
-        args.files = [
-            code_file
-            for code_file in get_branch_diff_filenames("./", args.base_path)
-            if _FILENAME_FILTER.match(code_file)
-        ]
     return args
 
 

umdp3_fixer/rosestem_branch_checker.py

@@ -84,10 +84,11 @@ def diff_cwd_working(model_source, path, saved_umask, tmpdir):
             # we select only <x>
             print("[FAIL] " + diff_filesname.split()[1])
         print(
-            "Please run rose-stem/bin/umdp3_fixer.py on each of the "
+            "Please run umdp3_fixer.py on each of the "
             "failed files in your working copy and check the changes. "
             "Then commit the changes to your branch and then re-run all "
-            "rose-stem testing."
+            "rose-stem testing.\n\nThe umdp3_fixer.py script can be found in "
+            "https://github.com/MetOffice/SimSys_Scripts.git"
         )
         os.umask(saved_umask)
         shutil.rmtree(tmpdir)