Merge 10-tomlparams-supporting-defaults-as-directory-of-toml-files -> main #11
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
- Still needs loads of testing
when default as directory is read.
tomlparams/parse_helpers.py
Outdated
There was a problem hiding this comment.
Nice tidy-ups in here, cheers!
| params_default_as_file[default_primary_key].get_params() | ||
| ) | ||
| ) | ||
| self.assertEqual(d_as_dir, d_as_file) |
There was a problem hiding this comment.
Will order of keys matter here too in this comparison? If so, would we want the test to fail if key order differed? If not, might be worth comparing sets after concatenate_keys() here?
tomlparams/utils.py
Outdated
| @@ -34,3 +34,23 @@ def load_toml(path): | |||
| f'\n***\n*** Problem parsing {path}:\n***\n', file=sys.stderr | |||
| ) | |||
| raise | |||
|
|
|||
|
|
|||
| def concatenate_keys(d: dict, sep='.'): | |||
There was a problem hiding this comment.
Mark return type here? Think it would be Generator[tuple[str, Any], None, None]. Or could be more specific and replace Any with supported types in TOML.
Hmm, actually - do we know that the keys will always be strings? Is that a TOML requirement?
tomlparams/tomlparams.py
Outdated
| ' is not allow in the consolidated defaults.' | ||
| ) | ||
| if defaults: | ||
| defaults_concatenated_keys = ( |
There was a problem hiding this comment.
I would make defaults_concatenated_keys and toml_dict_concatenated_keys here sets, and you could then do
if keys_in_common := defaults_concatenated_keys.intersection(toml_dict_concatenated_keys):
raise KeyError(
f"Duplicated key(s) '{keys_in_common}' in {toml}. Check"
f" any of the files in {all_tomls[:i]}"
)
- Add corrrect return type in concatenate_keys - test_content_defaults_as_directory tuple -> set - tomlparams.py: defaults_concatenated_keys -> set - Remove test option from the cli
- test if we have repeated keys in one of the toml to composed defaults aas directory.
| @@ -0,0 +1,2 @@ | |||
| [human] | |||
There was a problem hiding this comment.
This is the repeated key right? Maybe time down the number of other files for this one test, as that behaviour already well tested previously
- we creatse as_dict method on params_group to use for hashing.
vadrienzo
deleted the
10-tomlparams-supporting-defaults-as-directory-of-toml-files
branch
Automated changes by create-pull-request GitHub action