sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'hotfix/v6.28'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-03-19 22:11:55 +01:00
parent 1dcffc4852 ff4a095c04
commit e162cbd9b5
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/tasks.py
View File

@@ -25,6 +25,8 @@ import matplotlib.pyplot as plt
from rowsandall_app.settings import SITE_URL from rowsandall_app.settings import SITE_URL
from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
from rowsandall_app.settings import PROGRESS_CACHE_SECRET from rowsandall_app.settings import PROGRESS_CACHE_SECRET
from rowsandall_app.settings import SETTINGS_NAME
os.environ.setdefault('DJANGO_SETTINGS_MODULE', SETTINGS_NAME)
import pandas as pd import pandas as pd

2
rowsandall_app/settings.py
View File

@@ -402,3 +402,5 @@ try:
WARNING_MESSAGE = CFG['warning_message'] WARNING_MESSAGE = CFG['warning_message']
except KeyError: except KeyError:
WARNING_MESSAGE = '' WARNING_MESSAGE = ''
SETTINGS_NAME = 'rowsandall_app.settings'

2
rowsandall_app/settings_dev.py
View File

@@ -95,4 +95,4 @@ EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
EMAIL_USE_TLS = CFG['email_use_tls'] EMAIL_USE_TLS = CFG['email_use_tls']
DEFAULT_FROM_EMAIL = 'info@rowsandall.com' DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
SETTINGS_NAME = 'rowsandall_app.settings_dev'