From 2e1108670714b909037c7e26eaec8327206dd95a Mon Sep 17 00:00:00 2001 From: henrikek Date: Thu, 28 May 2026 12:27:22 +0200 Subject: [PATCH] Fix circular import for settings --- ESSArch_Core/config/local_settings.default | 3 --- ESSArch_Core/config/settings.py | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ESSArch_Core/config/local_settings.default b/ESSArch_Core/config/local_settings.default index d065cd204..db82b604f 100644 --- a/ESSArch_Core/config/local_settings.default +++ b/ESSArch_Core/config/local_settings.default @@ -1,12 +1,9 @@ import os from ESSArch_Core.config.settings import ( - AUTHENTICATION_BACKENDS, CONFIG_DIR, ESSARCH_DIR, - INSTALLED_APPS, LOGGING_DIR, - MIDDLEWARE, env, ) diff --git a/ESSArch_Core/config/settings.py b/ESSArch_Core/config/settings.py index e7c6a5419..e95b559de 100644 --- a/ESSArch_Core/config/settings.py +++ b/ESSArch_Core/config/settings.py @@ -60,6 +60,10 @@ IS_MSSQL = default_db_config.get('ENGINE') == 'mssql' +# Database +DATABASES = {'default': default_db_config} +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + # Exclude file formats keys from content indexing. Example: ['fmt/569',] EXCLUDE_FILE_FORMAT_FROM_INDEXING_CONTENT = env.list('ESSARCH_EXCLUDE_FILE_FORMAT_FROM_INDEXING_CONTENT', default=[]) @@ -198,11 +202,6 @@ ]) MIDDLEWARE.extend(env.list('ESSARCH_MIDDLEWARE_EXTRA', default=[])) -# Database -DATABASES = {'default': default_db_config} - -DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' - try: import test_without_migrations # noqa except ImportError: @@ -633,6 +632,15 @@ try: from local_essarch_settings import * # noqa isort:skip + INSTALLED_APPS.extend(locals().get('LOCAL_INSTALLED_APPS', [])) + AUTHENTICATION_BACKENDS.extend( + locals().get('LOCAL_AUTHENTICATION_BACKENDS', []) + ) + # AUTHENTICATION_BACKENDS = ( + # locals().get('LOCAL_AUTHENTICATION_BACKENDS', []) + # + AUTHENTICATION_BACKENDS + # ) + MIDDLEWARE.extend(locals().get('LOCAL_MIDDLEWARE', [])) except ImportError as e: if e.name == 'local_essarch_settings': raise ImportError('No settings file found, create one by running `essarch settings generate`')