From f0e695a60934262ed3cc1de262e0f16194d81344 Mon Sep 17 00:00:00 2001 From: Suryansh5545 <34577232+Suryansh5545@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:47:03 +0530 Subject: [PATCH] Fix test for github action --- apps/base/tests.py | 1 - docker-compose-prod.yml | 0 settings/common.py | 21 ++++++++++++--------- settings/dev.py | 11 ----------- settings/prod.py | 12 ++++++++++++ 5 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 docker-compose-prod.yml diff --git a/apps/base/tests.py b/apps/base/tests.py index 5f8e643..85d9b05 100644 --- a/apps/base/tests.py +++ b/apps/base/tests.py @@ -1,7 +1,6 @@ import os from django.core import mail from django.test import TestCase -from unittest.mock import patch from base.utils import get_url_from_hostname, EmailService, get_file_content from django.conf import settings diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml new file mode 100644 index 0000000..e69de29 diff --git a/settings/common.py b/settings/common.py index db61c76..95ca8ea 100644 --- a/settings/common.py +++ b/settings/common.py @@ -157,15 +157,18 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -# Email settings if EMAIL_REQUIRED is set to True -if os.environ.get("EMAIL_REQUIRED") == "True": - EMAIL_HOST = os.environ.get("EMAIL_HOST", "email_host") - EMAIL_PORT = os.environ.get("EMAIL_PORT", "email_port") - EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER", "email_host_user") - EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD", "email_host_password") - EMAIL_USE_SSL = os.environ.get("EMAIL_USE_SSL", "email_use_ssl") - EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' - DEFAULT_FROM_EMAIL = EMAIL_HOST_USER +EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" + +DATABASES = { + "default": { + "ENGINE": "django.db.backends.postgresql", + "NAME": os.environ.get("POSTGRES_NAME", "evalai"), + "USER": os.environ.get("POSTGRES_USER", "postgres"), + "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "postgres"), + "HOST": os.environ.get("POSTGRES_HOST", "localhost"), + "PORT": os.environ.get("POSTGRES_PORT", 5432), + } +} # Celery settings CELERY_BROKER_URL = os.environ.get("CELERY_BROKER_URL" , "redis://redis:6379/0") diff --git a/settings/dev.py b/settings/dev.py index 72a4c54..6166d7b 100644 --- a/settings/dev.py +++ b/settings/dev.py @@ -4,14 +4,3 @@ # Database # https://docs.djangoproject.com/en/4.2/ref/settings/#databases - -DATABASES = { - "default": { - "ENGINE": "django.db.backends.postgresql", - "NAME": os.environ.get("POSTGRES_NAME", "evalai"), - "USER": os.environ.get("POSTGRES_USER", "postgres"), - "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "postgres"), - "HOST": os.environ.get("POSTGRES_HOST", "localhost"), - "PORT": os.environ.get("POSTGRES_PORT", 5432), - } -} \ No newline at end of file diff --git a/settings/prod.py b/settings/prod.py index fa2f74a..9e50623 100644 --- a/settings/prod.py +++ b/settings/prod.py @@ -2,6 +2,18 @@ import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration + +# Email settings if EMAIL_REQUIRED is set to True +if os.environ.get("EMAIL_REQUIRED") == "True": + EMAIL_HOST = os.environ.get("EMAIL_HOST", "email_host") + EMAIL_PORT = os.environ.get("EMAIL_PORT", "email_port") + EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER", "email_host_user") + EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD", "email_host_password") + EMAIL_USE_SSL = os.environ.get("EMAIL_USE_SSL", "email_use_ssl") + EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' + DEFAULT_FROM_EMAIL = EMAIL_HOST_USER + + # Rest Framework REST_FRAMEWORK = { 'DEFAULT_RENDERER_CLASSES': (