From 9549bff7f1ece10f693e827fb2e32518237e8e4a Mon Sep 17 00:00:00 2001 From: theShinigami Date: Tue, 19 Nov 2024 15:42:54 +0300 Subject: [PATCH 1/3] refactor: import commented - commented unused imports because ruff was complaining. --- custom_auth/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_auth/views.py b/custom_auth/views.py index 91ea44a..fd0e044 100644 --- a/custom_auth/views.py +++ b/custom_auth/views.py @@ -1,3 +1,3 @@ -from django.shortcuts import render +# from django.shortcuts import render # Create your views here. From 68c1b99154a6a45c5afa39bffbd51c865beb7713 Mon Sep 17 00:00:00 2001 From: theShinigami Date: Tue, 19 Nov 2024 16:00:38 +0300 Subject: [PATCH 2/3] refactor(settings): moved db config --- core/settings_base.py | 10 ++++++++++ core/settings_prod.py | 17 +++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/core/settings_base.py b/core/settings_base.py index 0af7efa..173b33c 100644 --- a/core/settings_base.py +++ b/core/settings_base.py @@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/3.2/ref/settings/ """ +import os from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -130,3 +131,12 @@ # django.contrib.auth settings LOGIN_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/" + +# Database +# https://docs.djangoproject.com/en/3.2/ref/settings/#databases + +DB_USER = os.environ.get("DATABASE_USER") +DB_HOST = os.environ.get("DATABASE_HOST") +DB_PASSWORD = os.environ.get("DATABASE_PASSWORD") +DB_NAME = os.environ.get("DATABASE_NAME") +DB_PORT = os.environ.get("DATABASE_PORT", 5432) diff --git a/core/settings_prod.py b/core/settings_prod.py index fcfc3cd..23ac8d6 100644 --- a/core/settings_prod.py +++ b/core/settings_prod.py @@ -1,28 +1,17 @@ -from .settings_base import * - -import os +from .settings_base import * # noqa: F403 import dj_database_url ALLOWED_HOSTS = ["localhost", "127.0.0.1", "2025.djangocon.africa"] # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.environ["DJANGO_SECRET"] +SECRET_KEY = os.environ["DJANGO_SECRET"] # noqa: F405 DEBUG = False -# Database -# https://docs.djangoproject.com/en/3.2/ref/settings/#databases - -DB_USER = os.environ.get("DATABASE_USER") -DB_HOST = os.environ.get("DATABASE_HOST") -DB_PASSWORD = os.environ.get("DATABASE_PASSWORD") -DB_NAME = os.environ.get("DATABASE_NAME") -DB_PORT = os.environ.get("DATABASE_PORT", 5432) - DATABASES = { "default": dj_database_url.config( - default=f"postgres://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}" + default=f"postgres://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}" # noqa: F405 ) } From 8a739214f3f3a80d7af10d0ef4f1035e2f406cce Mon Sep 17 00:00:00 2001 From: theShinigami Date: Tue, 19 Nov 2024 16:00:47 +0300 Subject: [PATCH 3/3] refactor(settings): moved db config --- core/settings_dev.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/core/settings_dev.py b/core/settings_dev.py index 017c9d0..b85ed9a 100644 --- a/core/settings_dev.py +++ b/core/settings_dev.py @@ -1,15 +1,14 @@ -from .settings_base import * -import os +from .settings_base import * # noqa: F403 import dj_database_url SECRET_KEY = "not really a secret" DEBUG = True -MIDDLEWARE += [ +MIDDLEWARE += [ # noqa: F405 "django_browser_reload.middleware.BrowserReloadMiddleware", ] -INSTALLED_APPS += [ +INSTALLED_APPS += [ # noqa: F405 "django_browser_reload", "whitenoise.runserver_nostatic", ] @@ -22,11 +21,11 @@ # You can run this database using docker compose. # Look inside dev_db/README.md for details!! -DB_USER = "pguser" -DB_HOST = "127.0.0.1" -DB_PASSWORD = "password" -DB_NAME = "db" -DB_PORT = 6543 +DB_USER = os.environ.get("DATABASE_USER", "pguser") # noqa: F405 +DB_HOST = os.environ.get("DATABASE_HOST", "127.0.0.1") # noqa: F405 +DB_PASSWORD = os.environ.get("DATABASE_PASSWORD", "password") # noqa: F405 +DB_NAME = os.environ.get("DATABASE_NAME", "db") # noqa: F405 +DB_PORT = os.environ.get("DATABASE_PORT", 5432) # noqa: F405 DATABASES = { "default": dj_database_url.config(