fix(merge): dynaconf_merge=False on nested structures#1012
Merged
rochacbruno merged 6 commits intodynaconf:masterfrom Oct 4, 2023
Merged
fix(merge): dynaconf_merge=False on nested structures#1012rochacbruno merged 6 commits intodynaconf:masterfrom
rochacbruno merged 6 commits intodynaconf:masterfrom
Conversation
✅ Deploy Preview for dynaconf ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
Codecov Report
@@ Coverage Diff @@
## master #1012 +/- ##
==========================================
+ Coverage 98.70% 98.75% +0.04%
==========================================
Files 23 23
Lines 2247 2248 +1
==========================================
+ Hits 2218 2220 +2
+ Misses 29 28 -1
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
rochacbruno
approved these changes
Oct 4, 2023
pedro-psb
added a commit
to pedro-psb/dynaconf
that referenced
this pull request
Oct 31, 2023
Shortlog of commit since last release:
Bruno Rocha (2):
Release version 3.2.3
fix(env): allow underscore in env name dynaconf#1011 (dynaconf#1015)
Jake Callahan (1):
fix(vault): pin hvac minimum version
Pedro Pessoa (3):
fix(set): non-str key raising type error dynaconf#1005 (dynaconf#1008)
fix(merge): dynaconf_merge=False on nested structures (dynaconf#1012)
fix(cli): support for 'entrypoint-path' in FLASK_APP dynaconf#946 (dynaconf#1014)
Sebastian Correa (1):
doc(validation): Improve Configuration and Validation sections of the docs (dynaconf#989)
Vladislav Sharapov (1):
doc(envvars): Fix link to configuration page (dynaconf#1020)
pedro-psb
added a commit
to pedro-psb/dynaconf
that referenced
this pull request
Nov 19, 2023
Shortlog of commit since last release:
Bruno Rocha (2):
Release version 3.2.3
fix(env): allow underscore in env name dynaconf#1011 (dynaconf#1015)
Jake Callahan (1):
fix(vault): pin hvac minimum version
Pedro Pessoa (3):
fix(set): non-str key raising type error dynaconf#1005 (dynaconf#1008)
fix(merge): dynaconf_merge=False on nested structures (dynaconf#1012)
fix(cli): support for 'entrypoint-path' in FLASK_APP dynaconf#946 (dynaconf#1014)
Sebastian Correa (1):
doc(validation): Improve Configuration and Validation sections of the docs (dynaconf#989)
Vladislav Sharapov (1):
doc(envvars): Fix link to configuration page (dynaconf#1020)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR implements two fixes.
fix(merge): dynaconf_merge=False on nested structures
Addresses the case when local
dynaconf_merge=Falseis used inside nested dict structures. Fix #835.fix(validate_on_update): exception when using validate_on_update with kwargs
validate_on_updatewould break when using kwargs and initial validators. Fix #994validate_on_updatedon't apply on those calls).Notes
On "dynaconf_merge=False on nested structures"
The equivalent test/support for lists (local list merge negation) is not supported because we don't have a way of representing them, currently.