From 849497e87a22914fd2abd9377342f0d677730390 Mon Sep 17 00:00:00 2001 From: John-Scott Atlakson <24574+jsma@users.noreply.github.com> Date: Thu, 9 Nov 2023 23:50:59 -0800 Subject: [PATCH] Removed `bakerydemo-settings-local.py.example` This file never worked, it caused a circular import loop since it attempts to `from bakerydemo.settings.dev import *` but the dev settings does: ```python try: from .local import * # noqa except ImportError: pass ``` Fixed the `setup.sh` script to set the correct settings module environment variable Fixes #68 --- bakerydemo-settings-local.py.example | 6 ------ setup.sh | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 bakerydemo-settings-local.py.example diff --git a/bakerydemo-settings-local.py.example b/bakerydemo-settings-local.py.example deleted file mode 100644 index ad0df29..0000000 --- a/bakerydemo-settings-local.py.example +++ /dev/null @@ -1,6 +0,0 @@ -from bakerydemo.settings.dev import * # noqa -import dj_database_url - -# Override settings here -db_from_env = dj_database_url.config(conn_max_age=500) -DATABASES['default'].update(db_from_env) \ No newline at end of file diff --git a/setup.sh b/setup.sh index 18ded49..645ed5d 100755 --- a/setup.sh +++ b/setup.sh @@ -37,11 +37,11 @@ fi # Set up bakerydemo to use the Postgres database in the sister container if [ ! -f bakerydemo/bakerydemo/settings/local.py ]; then echo "Creating local settings file" - cp bakerydemo-settings-local.py.example bakerydemo/bakerydemo/settings/local.py + cp bakerydemo/bakerydemo/settings/local.py.example bakerydemo/bakerydemo/settings/local.py fi # Create a blank .env file in bakerydemo to keep its settings files from complaining if [ ! -f bakerydemo/.env ]; then echo "Creating file for local environment variables" - echo "DJANGO_SETTINGS_MODULE=bakerydemo.settings.local" > bakerydemo/.env + echo "DJANGO_SETTINGS_MODULE=bakerydemo.settings.dev" > bakerydemo/.env fi