Merge branch 'main' into core_only_macros

Author: james-bruten-mo

github_scripts/get_git_sources.py

@@ -5,8 +5,13 @@
 # -----------------------------------------------------------------------------
 """
 Helper functions for cloning git sources in command line builds
+
+Reads CONFLICT_IGNORES environment variable to get a list of comma-separated
+files/directories to ignore merge conflicts in. These should be relative to the
+top-level of the repo. If not set, then a default list is defined below.
 """
 
+import os
 import re
 import subprocess
 from datetime import datetime
@@ -231,17 +236,24 @@ def handle_merge_conflicts(source: str, ref: str, loc: Path, dependency: str) ->
     If merge conflicts are in `rose-stem/` or `dependencies.yaml` then accept the
     current changes and mark as resolved.
     If others remain then raise an error
+    If CONFLICT_IGNORES environment variable is set, use that as a comma-separated list
+    of files/directories to ignore. If not set, use a default list below.
     """
 
     # For suites, merge conflicts in these files/directories are unimportant so accept
     # the current changes
-    for filepath in ("dependencies.yaml", "rose-stem"):
+    ignores = os.environ.get(
+        "CONFLICT_IGNORES", "dependencies.yaml,rose-stem,CONTRIBUTORS.md"
+    ).split(",")
+    need_commit = False
+    for filepath in ignores:
         full_path = loc / filepath
         if not full_path.exists():
             continue
         logger.warning(f"Ignoring merge conflicts in {filepath}")
         run_command(f"git -C {loc} checkout --ours -- {filepath}")
-        run_command(f"git -C {loc} add {filepath}")
+        run_command(f"git -C {loc} add -f {filepath}")
+        need_commit = True
 
     # Check if there are any remaining merge conflicts
     unmerged = get_unmerged(loc)
@@ -254,6 +266,10 @@ def handle_merge_conflicts(source: str, ref: str, loc: Path, dependency: str) ->
             "\n\nThese will need changing in the source branches to be useable together"
         )
 
+    # Need to commit the ignored conflict fixes
+    if need_commit:
+        run_command(f"git -C {loc} commit -m 'fix conflict'")
+
 
 def get_unmerged(loc: Path) -> list[str]:
     """

lfric_macros/apply_macros.py

@@ -339,13 +339,14 @@ def parse_application_section(self, meta_dir: Path) -> Path:
 
     def get_dependency_paths(self, source: str | None, repo: str) -> Path:
         """
-        Parse the core command line arguments to get the path to a git clone.
+        Parse the core/jules command line arguments to get the path to a git clone.
         If the source isn't defined, first populate the source by reading the
         dependencies.yaml file.
         If the source is a remote GitHub source clone it to a temporary location
         Inputs:
             - source, The command line argument for the source. If not set this will be
               None
+            - repo, The name of the repository to clone
         Outputs:
             - The path to the source working copy to use
         """

lfric_macros/check_macro_chains.py

@@ -135,8 +135,11 @@ def main() -> None:
 
     source_apps = Path(os.environ["SOURCE_ROOT"]) / "lfric_apps"
     source_core = Path(os.environ["SOURCE_ROOT"]) / "lfric_core"
+    source_jules = Path(os.environ["SOURCE_ROOT"]) / "jules"
 
-    macro_object = ApplyMacros("vn0.0_t0", None, "vn0.0", source_apps, source_core)
+    macro_object = ApplyMacros(
+        "vn0.0_t0", None, "vn0.0", source_apps, source_core, source_jules
+    )
     apps_meta_dirs = macro_object.find_meta_dirs(macro_object.root_path / "rose-meta")
 
     rose_apps = find_upgradeable_apps(

lfric_macros/release_lfric.py

@@ -357,6 +357,34 @@ def update_versions_file(meta_dirs: list[Path], upgrade_name: str) -> None:
         add_new_import(versions_file, upgrade_name)
 
 
+def update_versions_mod(repo: str, filepath: Path, version: str) -> None:
+    """
+    Update the versions numbers in lfric versions mod files
+    """
+
+    print(f"[INFO] Updating lfric_{repo}_versions_mod.F90")
+
+    version = version.removeprefix("vn").split(".")
+    updates = {
+        "major": version[0],
+        "minor": version[1],
+        "patch": "0",
+        "release": ".true.",
+    }
+
+    lines = filepath.read_text().split("\n")
+    for i, line in enumerate(lines):
+        if len(updates) == 0:
+            break
+        for item, val in updates.items():
+            if re.match(rf".*::\s*lfric_{repo}_{item}_version\s*=", line):
+                lines[i] = f"{line.split('=')[0]} = {val}"
+                del updates[item]
+                break
+
+    filepath.write_text("\n".join(lines))
+
+
 def ticket_number(opt: str) -> str:
     """
     Check that the command line supplied ticket number is of a suitable format
@@ -408,9 +436,8 @@ def parse_args() -> argparse.Namespace:
         "--apps",
         default=Path(".").absolute(),
         type=Path,
-        help="The path to the LFRic Apps working copy being used. Defaults to  "
-        "the location the script is being run from - this assumes you are in a "
-        "working copy.",
+        help="The path to the LFRic Apps working copy being used. Defaults to the "
+        "location the script is being run from - this assumes you are in an Apps clone",
     )
     parser.add_argument(
         "-c",
@@ -481,6 +508,26 @@ def main() -> None:
 
     update_versions_file(meta_dirs, upgrade_file_name)
 
+    update_versions_mod(
+        "apps",
+        args.apps
+        / "science"
+        / "shared"
+        / "source"
+        / "utilities"
+        / "lfric_apps_version_mod.f90",
+        args.version,
+    )
+    update_versions_mod(
+        "core",
+        args.core
+        / "infrastructure"
+        / "source"
+        / "utilities"
+        / "lfric_core_version_mod.f90",
+        args.version,
+    )
+
 
 if __name__ == "__main__":
     main()

lfric_macros/validate_rose_meta.py

@@ -20,7 +20,6 @@
 INVALID_METADATA = [
     "jules-lfric",
     "jules-lsm",
-    "lfric-jules-shared",
     "socrates-radiation",
     "um-aerosol",
     "um-boundary_layer",
@@ -191,6 +190,13 @@ def parse_args() -> argparse.Namespace:
         "required. If both are provided then it will be assumed that Apps is the "
         "repository to check.",
     )
+    parser.add_argument(
+        "-j",
+        "--jules",
+        default=None,
+        help="The path to the JULES source required for jules-lfric & jules-shared "
+        "metadata.",
+    )
 
     args = parser.parse_args()
 
@@ -204,6 +210,8 @@ def parse_args() -> argparse.Namespace:
         args.apps = Path(args.apps).absolute().expanduser()
     if args.core:
         args.core = Path(args.core).absolute().expanduser()
+    if args.jules:
+        args.jules = Path(args.jules).absolute().expanduser()
 
     return args
 
@@ -229,6 +237,9 @@ def main() -> None:
             # Apps hasn't been set
             source_path = args.core
             rose_meta_path = f"{args.core / 'rose-meta'}"
+    if args.jules:
+        meta_paths += f"-M {args.jules / 'rose-meta'} "
+        rose_meta_path += f":{args.jules / 'rose-meta'}"
 
     if check_rose_metadata(rose_meta_path, source_path) or check_rose_stem_apps(
         meta_paths, source_path