From 1b031eb4c9477c31f2eae3eef857a31b318fda08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?= Date: Mon, 3 Nov 2025 00:32:03 +0300 Subject: [PATCH] Merge db settings in settings/docker.py * We don't benefit from having separate definitions * Pycharm was marking this code block with "replace dictionary creation" recommendation --- djangoproject/settings/docker.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/djangoproject/settings/docker.py b/djangoproject/settings/docker.py index 1484a008e2..931ca57b03 100644 --- a/djangoproject/settings/docker.py +++ b/djangoproject/settings/docker.py @@ -8,18 +8,17 @@ "PASSWORD": os.environ.get("SQL_PASSWORD"), "HOST": os.environ.get("SQL_HOST"), "PORT": os.environ.get("SQL_PORT"), - } + }, + "trac": { + "ENGINE": "django.db.backends.postgresql", + "NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"), + "USER": os.environ.get("TRAC_USER", "code.djangoproject"), + "PASSWORD": os.environ.get("TRAC_PASSWORD", ""), + "HOST": os.environ.get("TRAC_HOST", "db"), + "PORT": os.environ.get("TRAC_PORT", "5432"), + }, } -# Trac connection -DATABASES["trac"] = { - "ENGINE": "django.db.backends.postgresql", - "NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"), - "USER": os.environ.get("TRAC_USER", "code.djangoproject"), - "PASSWORD": os.environ.get("TRAC_PASSWORD", ""), - "HOST": os.environ.get("TRAC_HOST", "db"), - "PORT": os.environ.get("TRAC_PORT", "5432"), -} SECRET_KEY = os.environ.get("SECRET_KEY")