Merge branch 'bug/migration_problem_issue_236_devel' into 'master'

Bug/migration problem issue 236 devel

See merge request NCER-PD/scheduling-system!157

local_settings_ci.py

@@ -4,6 +4,11 @@ SECRET_KEY = 'Paste long random string here'  # Insert long random string
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
+DEV_APPS = [
+    'debug_toolbar',
+]
+
+
 WSGI_APPLICATION = 'smash.wsgi.application'
 
 # Database

requirements-dev.txt

 coverage
-django-debug-toolbar
+django-debug-toolbar==1.9
 mockito

requirements.txt

 Django==1.10.7
+django_otp==0.4.3
 gunicorn==19.6.0
 Pillow==3.4.2
 psycopg2==2.6.2
@@ -11,7 +12,8 @@ django-two-factor-auth==1.6.1
 nexmo
 django-excel==0.0.9
 pyexcel-xls==0.5.0
-pyexcel==0.5.3
+pyexcel==0.5.8
+pyexcel-io==0.5.8
 pycurl==7.43.0
 django-stronghold==0.2.9
 timeout-decorator==0.4.0

smash/smash/local_settings.py.template

@@ -2,7 +2,11 @@
 SECRET_KEY = 'Paste long random string here'  # Insert long random string
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
+
+DEV_APPS = [
+    # 'debug_toolbar',
+]
 
 WSGI_APPLICATION = 'smash.wsgi.application'
 

smash/smash/settings.py

@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/1.10/ref/settings/
 """
 
 import os
+from local_settings import DEV_APPS
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -36,11 +37,11 @@ INSTALLED_APPS = [
     'django_otp.plugins.otp_totp',
     'two_factor',
     'web',
-    'stronghold',
-
-    'debug_toolbar'
+    'stronghold'
 ]
 
+INSTALLED_APPS += DEV_APPS
+
 MIDDLEWARE = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.middleware.security.SecurityMiddleware',