File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff 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 ("\t Found 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 ()
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ maintainers = [
1818]
1919
2020dependencies = [
21+ " deepmerge>=2.0" ,
2122 " packaging>=24.2" ,
2223 " pyyaml" ,
2324 " validate-pyproject" ,
You can’t perform that action at this time.
0 commit comments