diff --git a/.github/styles/Kedro/ignore-names.txt b/.github/styles/Kedro/ignore-names.txt index 663ce7d495..f9ae589049 100644 --- a/.github/styles/Kedro/ignore-names.txt +++ b/.github/styles/Kedro/ignore-names.txt @@ -89,6 +89,7 @@ Paricio Patel Peteris Pilla +Puneet Rashida Ravi Richard diff --git a/RELEASE.md b/RELEASE.md index 31b082842f..366ab3a5fd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -22,11 +22,13 @@ * Methods `_is_project` and `_find_kedro_project` have been moved to `kedro.utils`. We recommend not using private methods in your code, but if you do, please update your code to use the new location. ## Documentation changes +* Add missing description for `merge_strategy` argument in OmegaConfigLoader. ## Community contributions Many thanks to the following Kedroids for contributing PRs to this release: * [ondrejzacha](https://github.com/ondrejzacha) +* [Puneet](https://github.com/puneeter) # Release 0.19.3 diff --git a/kedro/config/omegaconf_config.py b/kedro/config/omegaconf_config.py index 229d6a4060..6b67e047b7 100644 --- a/kedro/config/omegaconf_config.py +++ b/kedro/config/omegaconf_config.py @@ -102,6 +102,8 @@ def __init__( # noqa: PLR0913 Can be overridden by supplying the `env` argument. custom_resolvers: A dictionary of custom resolvers to be registered. For more information, see here: https://omegaconf.readthedocs.io/en/2.3_branch/custom_resolvers.html#custom-resolvers + merge_strategy: A dictionary that specifies the merging strategy for each configuration type. + The accepted merging strategies are `soft` and `destructive`. Defaults to `destructive`. """ self.base_env = base_env or "" self.default_run_env = default_run_env or ""