Merging main into the branch #196
Merged
Conversation
This file contains 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
- this is for later organization and parsing when yamls are combined
- combine model, compile, and platform yaml - parse combined yaml
- added `-e` experiment and `--execute` options - redefine variables with parsed information - createCheckout: fix checkout script running if `--execute` used and checkour script already created
- this is done in the separate tool `combine-yamls`
- certain variables were overwritten when bind mode is implemented - these variables are saved in `BACKUP` variables
- accidentally removed
- combine-yamls here if tool wasn't used
- reflects changes in `fre yamltools combine-yamls` - references defined `init_pp_yamls` class in `combine-yamls` to make combining a default behavior (on top of tool still being available if user wants to combine separately) - update schema.json for pp combined yaml
- classes were created so combining yamls can be done if user doesn't want to use `combine-yamls` tool - still keeps option to use `combine-yamls` as a separate tool - class for combining compile yamls - class for combining pp yamls
- new test for validation of combiend yamls - new fail test for if compile yaml path not correct - new fail test for if a value in the compile.yaml is not of right data type
- there was a false success with the previous schema
- update paths in test script based on reorganizations - update test_combine_yamls for validation test, wrong compile file test, wrong data type (invalid yaml) test
Previously, the test verified the exit code and message for (fre-cli) c2b:~/git/fre-cli%>fre catalog builder 134 No paths given, using yaml configuration (fre-cli) c2b:~/git/fre-cli%>echo $status 135 1 Recently, the message was updated to be: (fre-cli) c2b:~/git/fre-cli%>fre catalog builder 134 Missing: input_path or output_path. Pass it in the config yaml or as command-line option (fre-cli) c2b:~/git/fre-cli%>echo $status 135 1 So let's continue to check for the exit code and not require an exact error message.
Previously, the test verified the exit code and message for
(fre-cli) c2b:~/git/fre-cli%>fre catalog builder
No paths given, using yaml configuration
(fre-cli) c2b:~/git/fre-cli%>echo $status
1
Recently, the message was updated to be:
(fre-cli) c2b:~/git/fre-cli%>fre catalog builder
Missing: input_path or output_path. Pass it in the config yaml or as command-line option
(fre-cli) c2b:~/git/fre-cli%>echo $status
1
So the test needs a corresponding change to test for the updated error message
Update "fre catalog builder" test after upstream CatalogBuilder change
Update conda package version to 2024.01
Otherwise, the cmor test will fail when run afterwards
Compile yaml integration and parse correctly
#187 Add fremake README back in
Update yamltools README.md
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.
Describe your changes
Issue ticket number and link (if applicable)
Checklist before requesting a review