-
Notifications
You must be signed in to change notification settings - Fork 11
Suite merge script #169
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.
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
Open
james-bruten-mo
wants to merge
30
commits into
MetOffice:main
Choose a base branch
from
james-bruten-mo:suite_merge_script
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Suite merge script #169
james-bruten-mo
wants to merge
30
commits into
MetOffice:main
from
james-bruten-mo:suite_merge_script
+343
−83
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
t00sa
reviewed
Jan 28, 2026
Contributor
t00sa
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A handful of suggestions
github_scripts/get_git_sources.py
Outdated
Comment on lines
73
to
76
| print( | ||
| f"[{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}] Cloning " | ||
| f"{repo} from {mirror_loc} at ref {ref}" | ||
| ) |
Contributor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you considered using the logging module for these instead of printing?
Co-authored-by: Sam Clarke-Green <[email protected]>
Co-authored-by: Sam Clarke-Green <[email protected]>
Co-authored-by: Sam Clarke-Green <[email protected]>
Co-authored-by: Sam Clarke-Green <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Summary
Sci/Tech Reviewer: @t00sa
Code Reviewer: @cameronbateman-mo
Initial attempt at a script to merge different git branches for use in suites. The changes have been tested with the LFRic suites and with the lfric_apps rose-stem at
vn3.0. If we think this is a good idea I'll also modify the UM suites to use this extraction method to maintain consistency.These changes allow the
dependencies.yamlfile to specify multiple branches to merge together. This can be done by:which will clone the first source and then merge each subsequent source into this. It's currently setup to ignore merge conflicts in
rose-stemanddependencies.yamlas these files aren't important for running scientific suites.Code Quality Checklist
Testing
LFRic standalone suites and lfric_apps rose-stem at vn3.0
Security Considerations
AI Assistance and Attribution
Sci/Tech Review
(Please alert the code reviewer via a tag when you have approved the SR)
Code Review