Skip to content

Commit

Permalink
Fix test for github action
Browse files Browse the repository at this point in the history
  • Loading branch information
Suryansh5545 committed Aug 1, 2023
1 parent 269533a commit f0e695a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 21 deletions.
1 change: 0 additions & 1 deletion apps/base/tests.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Empty file added docker-compose-prod.yml
Empty file.
21 changes: 12 additions & 9 deletions settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
11 changes: 0 additions & 11 deletions settings/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
}
12 changes: 12 additions & 0 deletions settings/prod.py
Original file line number Diff line number Diff line change
Expand Up @@ -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': (
Expand Down

0 comments on commit f0e695a

Please sign in to comment.