Merge branch 'main' into git_bdiff

ericaneininger · web-flow · commit 00af69ae4a82 · 2025-07-23T10:21:41.000+01:00
diff --git a/git-migration/README.md b/git-migration/README.md
@@ -3,9 +3,9 @@
 This project is aimed to migrate the Met Office simulation systems repositories
 to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.
 
-
-> [!IMPORTANT] Pre-requisites to run the migration script
-> - Read access to the Met Office Science Repository [MOSRS](https://code.metoffice.gov.uk/trac/home) or the Met Office internal mirror (`svn://fcm1`).
+> [!NOTE] Pre-requisites to run the migration script
+>
+> - Read access to the Met Office Science Repository [MOSRS](https://code.metoffice.gov.uk/trac/home) or the Met Office internal mirror (~~`svn://fcm1`~~ `https://metomi/svn`).
 > - Optional Write access to the [Met Office GitHub organisation](https://github.com/MetOffice) for push to remote (usually, an admin).
 > - Tools: [`fcm`](https://metomi.github.io/fcm/doc/user_guide/introduction.html), [`git`](https://git-scm.com), [`gitlify`](https://github.com/MetOffice/gitlify), [`jq`](https://jqlang.org), and [`gh`](https://cli.github.com) available on the system.
 
@@ -28,7 +28,7 @@ to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.
      - [x] Contact [metomi](https://github.com/metomi/mule) owner to deprecate their repository.
    - [x] `svn:gcom/main` (@trunk) → [gcom](https://github.com/MetOffice/gcom) (@trunk)
    - [x] `svn:jules/main` (@trunk) → [jules](https://github.com/MetOffice/jules) (@trunk)
-     - [ ] Check licence agreements, if going public.
+     - [ ] Check licence agreements, if going public. (_in progress..._)
      - [ ] Plan to migrate JULES documentation here.
    - [x] `svn:socrates/main` (@trunk) → [socrates](https://github.com/MetOffice/socrates) (@trunk)
    - [x] `svn:utils/shumlib` (@trunk) → [shumlib](https://github.com/MetOffice/shumlib) (@trunk)
@@ -38,7 +38,7 @@ to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.
    - [x] `svn:moci/main` (@trunk) → [moci](https://github.com/MetOffice/moci) (@trunk)
    - [x] `svn:lfric/LFRic` (@trunk) → [lfric_core](https://github.com/MetOffice/lfric_core) (@trunk)
      - [x] Repository already exists: ask for admin access to the repository.
-   - [x] `svn:lfric/GPL-utilities` (@trunk) → [lfri_gpl_utils](https://github.com/MetOffice/lfri_gpl_utils) (@trunk)
+   - [x] `svn:lfric/GPL-utilities` (@trunk) → [rose_picker](https://github.com/MetOffice/rose_picker) (@trunk)
    - [x] `svn:lfric_apps/main` (@trunk) → [lfric_apps](https://github.com/MetOffice/lfric_apps) (@trunk)
      - [ ] Propose `lfric_core` as a submodule in this repository?
    - [x] Check `config.json` is correct and up-to-date with MOSRS revisions.
@@ -50,24 +50,24 @@ to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.
    - [ ] `LICENCE`
    - [ ] `CONTRIBUTING.md` (CLA)
    - [ ] Correct Copyright statements, particularly in planned open-source repositories. (_in progress..._)
-   - [ ] Map SRS to GitHub username, where possible. (_in progress..._)
+   - [ ] ~~Map SRS to GitHub username, where possible.~~
 
 4. Testbed
    - [ ] Create additional `main` branches.
    - [ ] Test Fab (build tool) integration. (_in progress..._)
    - [ ] Test Simulation System workflows with GitHub.
-   - [ ] Make sure tags/releases are still functional.
-   - [ ] Update Working practices.
+   - [x] Make sure tags/releases are still functional.
+   - [ ] Update Working practices. (_in progress..._)
    - [ ] Allow limited number of developers to test their workflows.
-   - [ ] Add/update Templates.
+   - [ ] Add/update Templates. (_in progress..._)
 
 5. During SRS freeze
+   - [x] Test `trunk` and `main` are able to merge with different history.
    - [ ] Merge `trunk` in _future_ default (`main`) and delete `trunk`
 
 6. Update communication plan
-   - [ ] Update [Simulation Systems Discussion](https://github.com/MetOffice/simulation-systems/discussions/337)
-   - [ ] Engage in [Simulation Systems Q&A](https://github.com/MetOffice/simulation-systems/discussions/categories/questions-and-answers)
-
+   - [x] Update [Simulation Systems Discussion](https://github.com/MetOffice/simulation-systems/discussions/337)
+   - [x] Engage in [Simulation Systems Q&A](https://github.com/MetOffice/simulation-systems/discussions/categories/questions-and-answers)
 
 ## FAQ
 
diff --git a/git-migration/config.json b/git-migration/config.json
@@ -173,7 +173,8 @@
         { "vn7.5": 28091 },
         { "vn7.6": 28692 },
         { "vn7.7": 29181 },
-        { "vn7.8": 29791 }
+        { "vn7.8": 29791 },
+        { "vn7.9": 30414 }
       ]
     },
     {
@@ -214,7 +215,8 @@
         { "um13.5": 1563 },
         { "um13.6": 1642 },
         { "um13.7": 1673 },
-        { "um13.8": 1741 }
+        { "um13.8": 1741 },
+        { "um13.9": 1831 }
       ]
     },
     {
@@ -232,7 +234,8 @@
         { "um13.5": 3314 },
         { "um13.6": 4075 },
         { "um13.7": 4898 },
-        { "um13.8": 5509 }
+        { "um13.8": 5509 },
+        { "um13.9": 6356 }
       ]
     },
     {
@@ -266,6 +269,7 @@
         { "um13.6": 7464 },
         { "um13.7": 7655 },
         { "um13.8": 7655 },
+        { "um13.9": 7859 },
         { "2017.06.1": 874 },
         { "2017.10.1": 1223 },
         { "2018.01.1": 1552 },
@@ -332,7 +336,8 @@
         { "vn1.21": 110005 },
         { "vn1.22": 118501 },
         { "vn1.23": 122041 },
-        { "vn1.24": 126461 }
+        { "vn1.24": 126461 },
+        { "vn1.25": 130034 }
       ]
     },
     {
@@ -371,7 +376,8 @@
         { "vn13.4": 120793 },
         { "vn13.5": 123441 },
         { "vn13.6": 125228 },
-        { "vn13.7": 127063 }
+        { "vn13.7": 127063 },
+        { "vn13.8": 128862 }
       ]
     },
     {
@@ -424,7 +430,8 @@
         { "vn13.5": 123226 },
         { "vn13.6": 124981 },
         { "vn13.7": 127030 },
-        { "vn13.8": 128625 }
+        { "vn13.8": 128625 },
+        { "vn13.9": 130128 }
       ]
     },
     {
@@ -510,7 +517,7 @@
       ]
     },
     {
-      "name": "lfric_gpl_utils",
+      "name": "rose_picker",
       "description": "LFRic GPL Tools",
       "trunk": "lfric/GPL-utilities",
       "tags": []
diff --git a/git-migration/ssd_svn2git.sh b/git-migration/ssd_svn2git.sh
@@ -142,15 +142,16 @@ process_repositories() {
   max_jobs=${BATCH:-$(nproc)}
   TIMESTAMP=$(date +'%Y%m%dT%H%M%S')
   LOG_DIR="${WORKDIR}/logs/${TIMESTAMP}"
-  mkdir -p "$LOG_DIR"
+  (( DRY_RUN )) || mkdir -p "$LOG_DIR"
   while read -r repo; do
     local repo_name trunk svn_url
     repo_name=$(jq -r '.name' <<<"$repo")
     [[ -z "$REPO_NAME" || "$REPO_NAME" == "$repo_name" ]] || continue
     trunk=$(jq -r '.trunk' <<<"$repo")
     svn_url="${SVN_PREFIX}/${trunk}"
     if (( FROM_MIRROR )); then
-      svn_url="svn://fcm1/${trunk////.xm_svn/}"
+      # svn_url="svn://fcm1/${trunk////.xm_svn/}"  # dropped in June 2025
+      svn_url="https://metomi/svn/${trunk////.xm/}"
     fi
     if (( DRY_RUN )); then
       printf "%-.56s %s\n" \
diff --git a/kgo_updates/meto_update_kgo.sh b/kgo_updates/meto_update_kgo.sh
@@ -71,6 +71,8 @@ if [[ $platforms == *"ex1a"* ]]; then
             break
         fi
     done
+else
+    ex_kgo_host="unset"
 fi
 read -rp "Suite Name: " suite_name
 read -rp "Enter the path to the merged trunk WC (top directory): " wc_path
diff --git a/lfric_macros/release_lfric.py b/lfric_macros/release_lfric.py
@@ -99,20 +99,18 @@ def set_dependency_path(args):
         f.write("".join(x for x in lines))
 
 
-def find_meta_dirs(paths):
+def find_meta_dirs(paths, exclude_dirs=()):
     """
     Return a set of rose-metadata directories that can be found in the apps and
     core sources. Done by seaching for rose-meta.conf files. Records the parent
     directory of the current one, as rose-meta.conf files end up in HEAD/vnX.Y
     directories.
     """
 
-    print("[INFO] Finding rose metadata directories")
-
     dirs = set()
     for path in paths:
+        print("[INFO] Finding rose metadata directories in", path)
         for dirpath, dirnames, filenames in os.walk(path):
-            exclude_dirs = [".svn", "rose-stem", "integration-test"]
             dirnames[:] = [d for d in dirnames if d not in exclude_dirs]
             if "rose-meta.conf" in filenames:
                 dirs.add(os.path.dirname(dirpath))
@@ -407,7 +405,22 @@ def main():
 
     set_dependency_path(args)
 
-    meta_dirs = find_meta_dirs([args.apps, args.core])
+    # Find all metadata directories, excluing jules shared and lfric inputs as these have metadata but no macros.
+    exclude_dirs = (
+        ".svn",
+        "rose-stem",
+        "integration-test",
+        "lfric-jules-shared",
+        "lfricinputs",
+    )
+    meta_dirs = find_meta_dirs([args.apps, args.core], exclude_dirs)
+
+    # Find JULES shared metadata directories and combine with all other metadirs for where they are handled differently
+    jules_meta_path = os.path.join(
+        args.apps, "interfaces", "jules_interface", "rose-meta", "lfric-jules-shared"
+    )
+    jules_shared_meta_dirs = find_meta_dirs([jules_meta_path])
+    meta_dirs_plus_jules = meta_dirs.union(jules_shared_meta_dirs)
 
     update_version_number(args)
 
@@ -426,7 +439,7 @@ def main():
     )
     print("\n[INFO] Successfully upgraded apps")
 
-    copy_head_meta(meta_dirs, args)
+    copy_head_meta(meta_dirs_plus_jules, args)
 
     update_meta_import_path(meta_dirs, args)
 
diff --git a/script_copyright_checker/file/bom.template b/script_copyright_checker/file/bom.template
@@ -0,0 +1,5 @@
+! *****************************COPYRIGHT*******************************
+
+! (c) [Bureau of Meteorology]. All rights reserved.
+
+! *****************************COPYRIGHT*******************************
diff --git a/suite_report.py b/suite_report.py
@@ -479,13 +479,13 @@ def __init__(
             # Final attempt to ensure the links have revision numbers and not
             # keywords which aren't evaluated in the browser.
             if proj_dict["repo link"] is not None and re.search(
-                r"rev=[a-zA-z]", proj_dict["repo link"]
+                r"rev=[a-zA-Z]", proj_dict["repo link"]
             ):
                 revision = self.revision_from_loc_layout(
                     proj_dict["repo mirror"], fcm_exec
                 )
                 proj_dict["repo link"] = re.sub(
-                    r"rev=[a-zA-z0-9.]+",
+                    r"rev=[a-zA-Z0-9.]+",
                     "rev=" + revision,
                     proj_dict["repo link"],
                 )

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,8 @@`
`173`	`173`	`{ "vn7.5": 28091 },`
`174`	`174`	`{ "vn7.6": 28692 },`
`175`	`175`	`{ "vn7.7": 29181 },`
`176`		`- { "vn7.8": 29791 }`
	`176`	`+ { "vn7.8": 29791 },`
	`177`	`+ { "vn7.9": 30414 }`
`177`	`178`	`]`
`178`	`179`	`},`
`179`	`180`	`{`
`@@ -214,7 +215,8 @@`
`214`	`215`	`{ "um13.5": 1563 },`
`215`	`216`	`{ "um13.6": 1642 },`
`216`	`217`	`{ "um13.7": 1673 },`
`217`		`- { "um13.8": 1741 }`
	`218`	`+ { "um13.8": 1741 },`
	`219`	`+ { "um13.9": 1831 }`
`218`	`220`	`]`
`219`	`221`	`},`
`220`	`222`	`{`
`@@ -232,7 +234,8 @@`
`232`	`234`	`{ "um13.5": 3314 },`
`233`	`235`	`{ "um13.6": 4075 },`
`234`	`236`	`{ "um13.7": 4898 },`
`235`		`- { "um13.8": 5509 }`
	`237`	`+ { "um13.8": 5509 },`
	`238`	`+ { "um13.9": 6356 }`
`236`	`239`	`]`
`237`	`240`	`},`
`238`	`241`	`{`
`@@ -266,6 +269,7 @@`
`266`	`269`	`{ "um13.6": 7464 },`
`267`	`270`	`{ "um13.7": 7655 },`
`268`	`271`	`{ "um13.8": 7655 },`
	`272`	`+ { "um13.9": 7859 },`
`269`	`273`	`{ "2017.06.1": 874 },`
`270`	`274`	`{ "2017.10.1": 1223 },`
`271`	`275`	`{ "2018.01.1": 1552 },`
`@@ -332,7 +336,8 @@`
`332`	`336`	`{ "vn1.21": 110005 },`
`333`	`337`	`{ "vn1.22": 118501 },`
`334`	`338`	`{ "vn1.23": 122041 },`
`335`		`- { "vn1.24": 126461 }`
	`339`	`+ { "vn1.24": 126461 },`
	`340`	`+ { "vn1.25": 130034 }`
`336`	`341`	`]`
`337`	`342`	`},`
`338`	`343`	`{`
`@@ -371,7 +376,8 @@`
`371`	`376`	`{ "vn13.4": 120793 },`
`372`	`377`	`{ "vn13.5": 123441 },`
`373`	`378`	`{ "vn13.6": 125228 },`
`374`		`- { "vn13.7": 127063 }`
	`379`	`+ { "vn13.7": 127063 },`
	`380`	`+ { "vn13.8": 128862 }`
`375`	`381`	`]`
`376`	`382`	`},`
`377`	`383`	`{`
`@@ -424,7 +430,8 @@`
`424`	`430`	`{ "vn13.5": 123226 },`
`425`	`431`	`{ "vn13.6": 124981 },`
`426`	`432`	`{ "vn13.7": 127030 },`
`427`		`- { "vn13.8": 128625 }`
	`433`	`+ { "vn13.8": 128625 },`
	`434`	`+ { "vn13.9": 130128 }`
`428`	`435`	`]`
`429`	`436`	`},`
`430`	`437`	`{`
`@@ -510,7 +517,7 @@`
`510`	`517`	`]`
`511`	`518`	`},`
`512`	`519`	`{`
`513`		`- "name": "lfric_gpl_utils",`
	`520`	`+ "name": "rose_picker",`
`514`	`521`	`"description": "LFRic GPL Tools",`
`515`	`522`	`"trunk": "lfric/GPL-utilities",`
`516`	`523`	`"tags": []`