-
Notifications
You must be signed in to change notification settings - Fork 26
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
Issuefixes #658
Issuefixes #658
Conversation
…er case hence on-the-fly debugging possible user-provided toml configuration files.
…on file and default one
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #658 +/- ##
==========================================
- Coverage 74.51% 74.29% -0.22%
==========================================
Files 111 111
Lines 7572 7691 +119
==========================================
+ Hits 5642 5714 +72
- Misses 1930 1977 +47
☔ View full report in Codecov by Sentry. |
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.
added a few comments, I will test it asap!
if confname not in added_files.keys(): | ||
continue | ||
f.write(f'"{added_files[confname]}": {infofile[confname]}\n') | ||
|
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.
I would return something here, like the paths to the saved file
src/haddock/gear/yaml2cfg.py
Outdated
Return | ||
------ | ||
ycfg : dict | ||
The full default configuration file as a dict | ||
OR | ||
cfg : dict | ||
A dictionnary containing only the default parameters values |
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.
is there any particular reason to have two different dict objects in output?
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.
There is the original one cfg
that only contains the ['default'] value and used in other parts of the code.
While the ycfg
one contrains verything present in the default.yaml file loaded as a dict, used for the analysis of the agreement (type, range, choices, sizes) between user provided configuration and authorized one.
Sorry I have absolutely no idea about this part of the code, will trust your judgment 🤞🏽 |
I still have orthographic issues... Co-authored-by: Marco Giulini <54807167+mgiulini@users.noreply.github.com>
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.
Runs nicely on a couple of examples, great addition @VGPReys!
You are about to submit a new Pull Request. Before continuing make sure you read the contributing guidelines and that you comply with the following criteria:
tox
tests pass. Runtox
command inside the repository folder-test.cfg
examples execute without errors. Insideexamples/
runpython run_tests.py -b
This PR aims at closing three issues:
data
directory of the run. This includes theoriginal inputed file
, theregular expression cleaned file
and theenhanced full parameter file
, which includes all default parameters in addition to the ones provided by the user. This closes Adding the config file to the data dir of a run #578Accordingly, additionnal tests were added, while some other test were modified to fit the new implementation.
Finally,
run_tests.py
ran without errors and the comparisons bycompare-runs.py
returned onlyNo errors found - OKAY!
.