From 6f0e3afa588132ae460ab0c74d9445665e22c24a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 19 Sep 2018 16:44:45 +0200
Subject: [PATCH] Revert "Merge branch 'bug/migration_problem_issue_236_devel'
into 'master'"
This reverts merge request !157
---
local_settings_ci.py | 5 -----
requirements-dev.txt | 2 +-
requirements.txt | 4 +---
smash/smash/local_settings.py.template | 6 +-----
smash/smash/settings.py | 7 +++----
5 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/local_settings_ci.py b/local_settings_ci.py
index ed9b9235..3a42e373 100644
--- a/local_settings_ci.py
+++ b/local_settings_ci.py
@@ -4,11 +4,6 @@ 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
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1955e77e..5bb00bd7 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,3 @@
coverage
-django-debug-toolbar==1.9
+django-debug-toolbar
mockito
diff --git a/requirements.txt b/requirements.txt
index ceeaa9bc..566c95d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
Django==1.10.7
-django_otp==0.4.3
gunicorn==19.6.0
Pillow==3.4.2
psycopg2==2.6.2
@@ -12,8 +11,7 @@ django-two-factor-auth==1.6.1
nexmo
django-excel==0.0.9
pyexcel-xls==0.5.0
-pyexcel==0.5.8
-pyexcel-io==0.5.8
+pyexcel==0.5.3
pycurl==7.43.0
django-stronghold==0.2.9
timeout-decorator==0.4.0
diff --git a/smash/smash/local_settings.py.template b/smash/smash/local_settings.py.template
index 37a160af..652a544a 100644
--- a/smash/smash/local_settings.py.template
+++ b/smash/smash/local_settings.py.template
@@ -2,11 +2,7 @@
SECRET_KEY = 'Paste long random string here' # Insert long random string
# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
-
-DEV_APPS = [
- # 'debug_toolbar',
-]
+DEBUG = True
WSGI_APPLICATION = 'smash.wsgi.application'
diff --git a/smash/smash/settings.py b/smash/smash/settings.py
index 1b0702cf..c11fe16a 100644
--- a/smash/smash/settings.py
+++ b/smash/smash/settings.py
@@ -11,7 +11,6 @@ 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__)))
@@ -37,10 +36,10 @@ INSTALLED_APPS = [
'django_otp.plugins.otp_totp',
'two_factor',
'web',
- 'stronghold'
-]
+ 'stronghold',
-INSTALLED_APPS += DEV_APPS
+ 'debug_toolbar'
+]
MIDDLEWARE = [
'debug_toolbar.middleware.DebugToolbarMiddleware',
--
GitLab