From 3254cfaa90c7e5ef30f12c9831c0f76405542872 Mon Sep 17 00:00:00 2001 From: matthewhegarty Date: Thu, 19 Dec 2024 11:32:11 +0000 Subject: [PATCH] reverted local changes --- .env | 2 -- AUTHORS.rst | 1 - test_project/settings.py | 9 +++------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 33bc22e..b445d99 100644 --- a/.env +++ b/.env @@ -1,5 +1,3 @@ # this docker-compose environment file # https://docs.docker.com/compose/env-file/#environment-file COMPOSE_PROJECT_NAME=django-import-export-extensions -DB_HOST=localhost -REDIS_HOST=localhost diff --git a/AUTHORS.rst b/AUTHORS.rst index ed2c5a4..948c493 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -15,4 +15,3 @@ Contributors * NikAzanov (Nikita Azanov) * ron8mcr (Roman Gorbil) * Eg0ra (Egor Toryshak) -* matthewhegarty (Matthew Hegarty) diff --git a/test_project/settings.py b/test_project/settings.py index 1b6542d..9a0325a 100644 --- a/test_project/settings.py +++ b/test_project/settings.py @@ -1,4 +1,3 @@ -import os import pathlib # Build paths inside the project like this: BASE_DIR / "subdir" @@ -69,7 +68,6 @@ # Database # https://docs.djangoproject.com/en/1.9/ref/settings/#databases -DB_HOST = os.environ.get("DB_HOST", "postgres") DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql", @@ -78,7 +76,7 @@ "USER": "django-import-export-extensions-user", "NAME": "django-import-export-extensions-dev", "PASSWORD": "testpass", - "HOST": DB_HOST, + "HOST": "postgres", "PORT": 5432, }, } @@ -125,10 +123,9 @@ CELERY_TASK_SERIALIZER = "pickle" CELERY_ACCEPT_CONTENT = ["pickle", "json"] -REDIS_HOST = os.environ.get("REDIS_HOST", "redis") CELERY_TASK_ROUTES = {} -CELERY_BROKER = f"redis://{REDIS_HOST}/1" -CELERY_BACKEND = f"redis://{REDIS_HOST}/1" +CELERY_BROKER = "redis://redis/1" +CELERY_BACKEND = "redis://redis/1" CELERY_TASK_DEFAULT_QUEUE = "development" DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"