Merge branch '593-enable-dynaconf-global-merge' into 'master'

Resolve "Enable Dynaconf global merge"

Closes #593

See merge request !859

CHANGELOG.rst

@@ -17,6 +17,7 @@ Fixed
 Changed
 ~~~~~~~
 
+* Configuration files are now deep merged by default
 * Improvements for shell_plus module loading
   * core.Group model now takes precedence over auth.Group
   * Name collisions are resolved by prefixing with the app label

aleksis/core/settings.py

@@ -14,6 +14,7 @@ IN_PYTEST = "PYTEST_CURRENT_TEST" in os.environ or "TOX_ENV_DIR" in os.environ
 
 ENVVAR_PREFIX_FOR_DYNACONF = "ALEKSIS"
 DIRS_FOR_DYNACONF = ["/etc/aleksis"]
+MERGE_ENABLED_FOR_DYNACONF = True
 
 SETTINGS_FILE_FOR_DYNACONF = []
 for directory in DIRS_FOR_DYNACONF:
@@ -29,6 +30,7 @@ for directory in DIRS_FOR_DYNACONF:
 _settings = LazySettings(
     ENVVAR_PREFIX_FOR_DYNACONF=ENVVAR_PREFIX_FOR_DYNACONF,
     SETTINGS_FILE_FOR_DYNACONF=SETTINGS_FILE_FOR_DYNACONF,
+    MERGE_ENABLED_FOR_DYNACONF=MERGE_ENABLED_FOR_DYNACONF,
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)