Skip to content

Bugfix and refactor deep_merge#202

Merged
tomschr merged 1 commit intomainfrom
toms/refactor-deep_merge
Mar 16, 2026
Merged

Bugfix and refactor deep_merge#202
tomschr merged 1 commit intomainfrom
toms/refactor-deep_merge

Conversation

@tomschr
Copy link
Copy Markdown
Contributor

@tomschr tomschr commented Mar 16, 2026

The previous implementation didn't deep-copy values. The current implementation fixes this and adds additional tests to cover also tuples and sets.

@tomschr tomschr added the kind:refactor Code cleanup without logic change. label Mar 16, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 16, 2026

Coverage Report

For commit 8814484

Click to expand Coverage Report
  Name                                           Stmts   Miss Branch BrPart  Cover
  --------------------------------------------------------------------------------
+ src/docbuild/models/deliverable.py               180      1     22      0  99.5%
+ src/docbuild/cli/cmd_check/process.py             58      0     22      1  98.8%
+ src/docbuild/models/manifest.py                  111      1     12      1  98.4%
+ src/docbuild/cli/cmd_cli.py                       93      1      8      1  98.0%
+ src/docbuild/utils/pidlock.py                     79      1     14      1  97.8%
+ src/docbuild/cli/cmd_validate/process.py         178      5     52      4  96.1%
+ src/docbuild/cli/callback.py                      35      0     10      2  95.6%
- src/docbuild/cli/cmd_config/__init__.py            9      1      0      0  88.9%
- src/docbuild/config/xml/stitch.py                 47      5     12      0  88.1%
- src/docbuild/cli/cmd_metadata/metaprocess.py     215     26     66     13  82.6%
- src/docbuild/cli/cmd_check/__init__.py            18      5      2      0  65.0%
- src/docbuild/cli/cmd_build/__init__.py            13      5      0      0  61.5%
- src/docbuild/cli/cmd_metadata/__init__.py         27     10      2      0  58.6%
- src/docbuild/cli/cmd_config/environment.py        11      6      2      0  38.5%
  --------------------------------------------------------------------------------
+ TOTAL                                           2903     67    678     23  97.0%
  
  46 files skipped due to complete coverage.

@tomschr tomschr force-pushed the toms/refactor-deep_merge branch from 4755095 to 4e820d7 Compare March 16, 2026 07:48
@tomschr tomschr requested a review from sushant-suse March 16, 2026 07:48
Comment thread src/docbuild/config/merge.py Outdated
@sushant-suse
Copy link
Copy Markdown
Collaborator

Thanks for your awesome work Toms. Looks good to me.

@tomschr tomschr force-pushed the toms/refactor-deep_merge branch from f3a02b2 to 3231275 Compare March 16, 2026 10:19
The previous implementation didn't deep-copy values. The current
implementation fixes this and adds additional tests to cover also
tuples and sets.

Test cases amended to cover also tests for truely deep copies.
Test coverage for test_deep_merge.py is 100%
@tomschr tomschr force-pushed the toms/refactor-deep_merge branch from 3231275 to 8814484 Compare March 16, 2026 10:20
@tomschr tomschr marked this pull request as ready for review March 16, 2026 10:20
@tomschr tomschr merged commit 2aba009 into main Mar 16, 2026
13 of 15 checks passed
@tomschr tomschr deleted the toms/refactor-deep_merge branch March 16, 2026 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind:refactor Code cleanup without logic change.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants