Skip to content

Conversation

@james-bruten-mo
Copy link
Collaborator

@james-bruten-mo james-bruten-mo commented Jun 11, 2025

Description

When a new metadata section with rose app is added, at commit to trunk the app needs to be updated to the latest metadata. This means any imported metadata macros need to be applied to the app and so they need to be copied into the new versions.py by apply_macros. This change adds that functionality.

I've tested this against the new Jules app to ensure it works. I've also checked normal macros work as they currently do. The new functions should get a unit test, but I've not yet added this. I'll open a new issue to add these, and to setup the unit tests to run as CI.

I'm not convinced that the combine_missing_macros function will work perfectly in more complex cases where there are multiple metadata imports. However it is ok for now and will unblock some existing apps tickets.

Checklist

  • I have performed a self-review of my own changes

@james-bruten-mo james-bruten-mo requested a review from a team as a code owner June 11, 2025 12:25
@james-bruten-mo
Copy link
Collaborator Author

After discussion with Jenny, we've decided we're missing a feature in apply_macros which is required for new metadata sections. I'll "take" this PR back and do that work here.

@james-bruten-mo
Copy link
Collaborator Author

@jennyhickson and @t00sa I think this is ready to be looked at. Cheers

Copy link
Collaborator

@jennyhickson jennyhickson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems generally sound - with further algorithmic improvements in the pipeline as discussed.

@james-bruten-mo
Copy link
Collaborator Author

Thanks Jenny, modifications made based on your comments, plus the addition of ordering the meta_dirs as discussed offline

@james-bruten-mo
Copy link
Collaborator Author

Thanks Jenny, modifications as per your comments. Also the addition of ordering the meta_dirs as discussed offline

Copy link
Collaborator

@jennyhickson jennyhickson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Think I'm happy. Over to Sam to take a look.

Copy link
Contributor

@t00sa t00sa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I've got a couple of minor suggestions and style suggestions

james-bruten-mo and others added 2 commits June 23, 2025 13:44
@james-bruten-mo james-bruten-mo requested a review from t00sa June 23, 2025 12:46
Copy link
Contributor

@t00sa t00sa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@t00sa t00sa merged commit aebc853 into main Jun 23, 2025
19 checks passed
@t00sa t00sa deleted the fix_macros_version_imports branch June 23, 2025 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants