Skip to content

Fix - Enable merge equal False#957

Merged
rochacbruno merged 5 commits intodynaconf:masterfrom
pedro-psb:enable-merge-equal-false
Jul 12, 2023
Merged

Fix - Enable merge equal False#957
rochacbruno merged 5 commits intodynaconf:masterfrom
pedro-psb:enable-merge-equal-false

Conversation

@pedro-psb
Copy link
Copy Markdown
Member

Fix #835 and #926

Overview

The problem was that False was treated as a general fallback and would not be used even if located in a high override-priority position:

  • local-scope marks
  • file-scope marks
  • global-flag

To solve it, I applied the same strategy used in some places of the codebase of using the empty sentinel for not-set values, thus making override priority relationships more explicit.

@netlify
Copy link
Copy Markdown

netlify bot commented Jul 12, 2023

Deploy Preview for dynaconf ready!

Name Link
🔨 Latest commit 2606d44
🔍 Latest deploy log https://app.netlify.com/sites/dynaconf/deploys/64aed1fffad3b80008bd7283
😎 Deploy Preview https://deploy-preview-957--dynaconf.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@pedro-psb pedro-psb changed the title Enable merge equal False Fix - Enable merge equal False Jul 12, 2023
Copy link
Copy Markdown
Member

@rochacbruno rochacbruno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@rochacbruno rochacbruno merged commit 1cd1c6f into dynaconf:master Jul 12, 2023
@pedro-psb pedro-psb deleted the enable-merge-equal-false branch July 12, 2023 22:06
pedro-psb added a commit to pedro-psb/dynaconf that referenced this pull request Jul 13, 2023
Shortlog of commits since last release:

    Bruno Rocha (4):
          Ignore docs build without a tag
          Cancel any running CI job when a Push is made to an existing PR or branch (dynaconf#952)
          Fix dynaconf#959 cli get will exit code 1 in case of KeyError. (dynaconf#960)
          add tech preview note to inspect docs (dynaconf#961)

    Pedro Pessoa (9):
          Docs - Update envvar.md custom token e.g. to use add_converter (dynaconf#941)
          Feature - Inspect and CLI (dynaconf#939)
          Fix - Template substitution with variable update (dynaconf#944)
          Assert dynaconf#658 works (dynaconf#945)
          fix infinite recursions in special case of django app dynaconf#867 (dynaconf#947)
          Fix - Django functions with `add_converter` (dynaconf#951)
          Fix hooks not re-running on reload dynaconf#850 (dynaconf#953)
          update vault and redis warning recommendations. fix dynaconf#950 (dynaconf#954)
          Fix - Enable merge equal False (dynaconf#957)
rochacbruno added a commit that referenced this pull request Aug 11, 2023
Shortlog of commits since last release:

    Bruno Rocha (5):
          Ignore docs build without a tag
          Cancel any running CI job when a Push is made to an existing PR or branch (#952)
          Fix #959 cli get will exit code 1 in case of KeyError. (#960)
          add tech preview note to inspect docs (#961)
          Build docs

    Hugo Prudente (1):
          Doc advanced usage for cli overrides dynaconf settings fix #967 (#970)

    Marian Ganisin (1):
          Feat: Support for multidoc yaml files (#825)

    Pedro Pessoa (11):
          Docs - Update envvar.md custom token e.g. to use add_converter (#941)
          Feature - Inspect and CLI (#939)
          Fix - Template substitution with variable update (#944)
          Assert #658 works (#945)
          fix infinite recursions in special case of django app #867 (#947)
          Fix - Django functions with `add_converter` (#951)
          Fix hooks not re-running on reload #850 (#953)
          update vault and redis warning recommendations. fix #950 (#954)
          Fix - Enable merge equal False (#957)
          CI - Test docker-compose pyyaml issue (#964)
          Fix: unexpected _bypass_evaluation in BoxList (#966)

    pedro-psb (1):
          Release version 3.2.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

dynaconf_merge = false supported?

2 participants