Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions properdocs/utils/yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import logging
import os
import os.path
from collections.abc import Mapping
from typing import IO, TYPE_CHECKING, Any

import mergedeep # type: ignore
import yaml
import yaml_env_tag # type: ignore

Expand Down Expand Up @@ -152,5 +152,14 @@ def yaml_load(
log.debug(f"Loading inherited configuration file: {abspath}")
with open(abspath, 'rb') as fd:
parent = yaml_load(fd, loader)
result = mergedeep.merge(parent, result)
result = deep_merge_dicts(parent, result)
return result


def deep_merge_dicts(dst: dict[str, Any], src: Mapping[str, Any]) -> dict[str, Any]:
for key, src_value in src.items():
if isinstance(dst.get(key), Mapping) and isinstance(src_value, Mapping):
deep_merge_dicts(dst[key], src_value)
else:
dst[key] = src_value
return dst
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ dependencies = [
"pyyaml_env_tag >=0.1",
"importlib-metadata >=4.4; python_version < '3.10'",
"packaging >=20.5",
"mergedeep >=1.3.4",
"pathspec >=0.11.1",
"platformdirs >=2.2.0",
"colorama >=0.4; platform_system == 'Windows'",
Expand Down
Loading