Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add unique label when merging lists to fix issue #653 #661

Merged
merged 1 commit into from Oct 4, 2021

Conversation

andressadotpy
Copy link
Collaborator

Add boolean variable inside _merge_before_set() method to check if the environment was set as default to change the unique bool to True to solve bug when merging two lists described in issue #653.

@codecov
Copy link

codecov bot commented Oct 1, 2021

Codecov Report

Merging #661 (8068161) into master (9c5f60b) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##            master      #661   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           21        21           
  Lines         1660      1661    +1     
=========================================
+ Hits          1660      1661    +1     
Impacted Files Coverage Δ
dynaconf/base.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9c5f60b...8068161. Read the comment docs.

@rochacbruno rochacbruno merged commit 912ce08 into dynaconf:master Oct 4, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2021

Test Results (Python 3.8)

    1 files  ±0      1 suites  ±0   33s ⏱️ ±0s
336 tests ±0  336 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit 912ce08. ± Comparison against base commit 912ce08.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2021

Test Results (Python 3.9)

    1 files  ±0      1 suites  ±0   39s ⏱️ ±0s
336 tests ±0  336 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit 912ce08. ± Comparison against base commit 912ce08.

@andressadotpy andressadotpy deleted the fix_issue_653 branch October 4, 2021 11:18
rochacbruno added a commit that referenced this pull request Apr 15, 2022
Shortlog of commits since last release:

    Anderson Sousa (1):
          Document the usage with python -m (#710)

    Andressa Cabistani (2):
          Add unique label when merging lists to fix issue #653 (#661)
          Add new validation to fix issue #585 (#667)

    Armin Berres (1):
          Fix typo in error message

    Bruno Rocha (7):
          Release version 3.1.7
          Found this bug that was duplicating the generated envlist (#663)
          Add support for Python 3.10 (#665)
          Attempt to fix #555 (#669)
          Create update_contributors.yml
          Fixing pre-coomit and docs CI
          Added `dynaconf get` command to cli (#730)

    Caneco (2):
          improvement: add brand new logo to the project (#686)
          improvement: update socialcard to match the python way (#687)

    EdwardCuiPeacock (2):
          Feature: add @Jinja and @Format casting (#704)
          Combo converter doc (#735)

    Eitan Mosenkis (1):
          Fix FlaskConfig.setdefault (#706)

    Enderson Menezes (Mr. Enderson) (2):
          Force PYTHONIOENCODING to utf-8 to fix #664 (#672)
          edit: move discussions to github tab (#682)

    Eugene Triguba (1):
          Fix custom prefix link in envvar documentation (#680)

    Gibran Herrera (1):
          Fix Issue 662 Lazy validation (#675)

    Jitendra Yejare (2):
          Load vault secrets from environment less stores or which are not written by dynaconf (#725)
          Use default value when settings is blank (#729)

    Pavel Alimpiev (1):
          Update docs link (#678)

    Ugo Benassayag (1):
          Added validate_only_current_env to validator (issue #734) (#736)

    Waylon Walker (1):
          Docs Fix Spelling (#696)

    dependabot[bot] (3):
          Bump django from 2.1.5 to 2.2.26 in /example/django_pytest_pure (#711)
          Bump mkdocs from 1.1.2 to 1.2.3 (#715)
          Bump django from 2.2.26 to 2.2.27 in /example/django_pytest_pure (#717)

    github-actions[bot] (2):
          [automated] Update Contributors File (#691)
          [automated] Update Contributors File (#732)

    lowercase00 (1):
          Makes Django/Flask kwargs case insensitive (#721)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Duplicated (non-default) list entries when using environments and merge enabled
3 participants