Skip to content

fix validate_rose_meta #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sam Clarke-Green (t00sa) merged 2 commits into from
Jun 1, 2026
Merged

fix validate_rose_meta #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08c29c8
fix validate_rose_meta
james-bruten-mo Jun 1, 2026
6625f76
add jules source
james-bruten-mo Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lfric_macros/check_macro_chains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
13 changes: 12 additions & 1 deletion lfric_macros/validate_rose_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
INVALID_METADATA = [
"jules-lfric",
"jules-lsm",
"lfric-jules-shared",
"socrates-radiation",
"um-aerosol",
"um-boundary_layer",
Expand Down Expand Up @@ -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()

Expand All @@ -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

Expand All @@ -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
Expand Down
Loading