Skip to content

Commit 7a8cad4

Browse files
committed
fix: use deepmerge instead of non-existing utility function
1 parent 56e80fe commit 7a8cad4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

octoprint_plugin_tool/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,13 +443,13 @@ def _generate_pyproject_toml(
443443

444444
if os.path.isfile(pyproject_toml):
445445
# pyproject.toml already exists, so let's merge things
446-
from octoprint.util import dict_merge
446+
from deepmerge import always_merger
447447

448448
log("\tFound an existing pyproject.toml, merging...")
449449
with open(pyproject_toml, mode="rb") as f:
450450
data = tomllib.load(f)
451451

452-
doc = dict_merge(doc, data)
452+
doc = always_merger.merge(doc, data)
453453

454454
# ensure we are producing valid pyproject data
455455
validator = validate_pyproject_api.Validator()

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ maintainers = [
1818
]
1919

2020
dependencies = [
21+
"deepmerge>=2.0",
2122
"packaging>=24.2",
2223
"pyyaml",
2324
"validate-pyproject",

0 commit comments

Comments
 (0)