Skip to content

Commit

Permalink
reverted local changes
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewhegarty committed Dec 19, 2024
1 parent 37c0d5e commit 3254cfa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ Contributors
* NikAzanov (Nikita Azanov)
* ron8mcr (Roman Gorbil)
* Eg0ra (Egor Toryshak)
* matthewhegarty (Matthew Hegarty)
9 changes: 3 additions & 6 deletions test_project/settings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os
import pathlib

# Build paths inside the project like this: BASE_DIR / "subdir"
Expand Down Expand Up @@ -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",
Expand All @@ -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,
},
}
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 3254cfa

Please sign in to comment.