Unvendor hiyapyco (#45)

* Unvendor hiyapyco

* Update changelog

CHANGELOG.md

@@ -10,8 +10,13 @@ and this project adheres to [Semantic Versioning][].
 
 ## [Unreleased]
 
+### Template updates
 -   Improve instruction text in quarto template to get users started more quickly ([#40](https://github.com/Boehringer-Ingelheim/dso/pull/40))
 
+### Fixes
+-   Remove vendored `hiyapyco` code since required changes were released upstream in v0.7.0 ([#45](https://github.com/Boehringer-Ingelheim/dso/pull/45)).
+-   `None` values in `params.in.yaml` can now be used to override anything, e.g. to disable watermarking only in a specific stage ([#45](https://github.com/Boehringer-Ingelheim/dso/pull/45)).
+
 ## v0.9.0
 
 ### New Features

pyproject.toml

@@ -25,6 +25,7 @@ classifiers = [
 dynamic = [ "version" ]
 dependencies = [
   "dvc",
+  "hiyapyco>=0.7",
   "jinja2",
   "panflute",
   "pillow",

src/dso/compile_config.py

@@ -8,11 +8,10 @@
 from pathlib import Path
 from textwrap import dedent
 
+import hiyapyco
 import rich_click as click
 from ruamel.yaml import YAML, yaml_object
 
-from dso import hiyapyco
-
 from ._logging import log
 from ._util import _find_in_parent, check_project_roots
 
@@ -151,6 +150,7 @@ def compile_all_configs(paths: Sequence[Path]):
         conf = hiyapyco.load(
             *[str(x) for x in configs_to_merge],
             method=hiyapyco.METHOD_MERGE,
+            none_behavior=hiyapyco.NONE_BEHAVIOR_OVERRIDE,
             interpolate=True,
             loader_callback=partial(_load_yaml_with_auto_adjusting_paths, destination=config.parent),
         )