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

fix(django):Enable merge on settings.populate_obj #1118

Merged
merged 1 commit into from
Jul 3, 2024
Merged

fix(django):Enable merge on settings.populate_obj #1118

merged 1 commit into from
Jul 3, 2024

Conversation

rochacbruno
Copy link
Member

@rochacbruno rochacbruno commented Jul 3, 2024

fix #1037

Django when using the "explicit mode" starts a dynaconf instance in the settings file and then calls populate_obj, this method was not aware of merging.

Copy link
Contributor

github-actions bot commented Jul 3, 2024

Test Results (Python 3.9)

545 tests  ±0   542 ✔️ ±0   54s ⏱️ ±0s
    1 suites ±0       3 💤 ±0 
    1 files   ±0       0 ±0 

Results for commit 191185e. ± Comparison against base commit 80a9fdf.

♻️ This comment has been updated with latest results.

Copy link
Contributor

github-actions bot commented Jul 3, 2024

Test Results (Python 3.12)

545 tests  ±0   544 ✔️ ±0   1m 7s ⏱️ -1s
    1 suites ±0       1 💤 ±0 
    1 files   ±0       0 ±0 

Results for commit 191185e. ± Comparison against base commit 80a9fdf.

♻️ This comment has been updated with latest results.

Copy link
Member

Choose a reason for hiding this comment

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

Why we have this file? I cant remember

Copy link
Member Author

Choose a reason for hiding this comment

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

Some tests doesn´t run on windows, so we skip it, it is mostly because file paths or usage of environment variables that are incompatible with windows (or I just dont know how to make work on windows)

@pedro-psb pedro-psb merged commit cdd4d15 into master Jul 3, 2024
33 checks passed
@pedro-psb pedro-psb deleted the 1037 branch July 3, 2024 21:02
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.

[bug] Django and Dynaconf: Can't merge INSTALLED_APPS from external settings_file into settings.py
2 participants