Improve database settings

- Prevents conflicts with other systems
- Less unused code, yay

Author: emyller

.github/workflows/python-test.yml

@@ -24,14 +24,14 @@ jobs:
         image: postgres:15.5-alpine
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
-        ports: ['5432:5432']
+        ports: ["6543:5432"]
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
       task-processor-database:
         image: postgres:15.5-alpine
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
-        ports: ['5433:5432']
+        ports: ["6544:5432"]
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:

docker/docker-compose.local.yml

@@ -16,7 +16,7 @@ services:
     volumes:
       - default-database:/var/lib/postgresql/data
     ports:
-      - 5432:5432
+      - 6543:5432
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
       TZ: UTC
@@ -31,7 +31,7 @@ services:
     volumes:
       - task-processor-database:/var/lib/postgresql/data
     ports:
-      - 5433:5432
+      - 6544:5432
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
       TZ: UTC

settings/dev.py

@@ -25,17 +25,13 @@
 # Settings required for tests
 SECRET_KEY = "test"
 DATABASES = {
-    "default": dj_database_url.parse(
-        env(
-            "DATABASE_URL",
-            default="postgresql://postgres@localhost:5432/postgres",
-        ),
+    "default": (
+        default_database_url := dj_database_url.parse(
+            "postgresql://postgres@localhost:6543/postgres",
+        )
     ),
     "task_processor": dj_database_url.parse(
-        env(
-            "TASK_PROCESSOR_DATABASE_URL",
-            default="postgresql://postgres@localhost:5433/postgres",
-        ),
+        "postgresql://postgres@localhost:6544/postgres",
     ),
 }
 TASK_PROCESSOR_DATABASES = ["default"]