From 75eba6fe02babf4a4e86997578e2caf9f7ba828e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 14 Apr 2017 19:37:35 +0200
Subject: Django 1.8: fix import errors, deprecation warnings and models
 warnings

---
 example_project/settings.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'example_project/settings.py')

diff --git a/example_project/settings.py b/example_project/settings.py
index 78d97f0ae..eaa1fb7f5 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -137,10 +137,8 @@ INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.gis',
     'django.contrib.staticfiles',
-    'django.contrib.formtools',
     'django.contrib.messages',
     'django.contrib.humanize',
-    'south',
     'registration',
     # 'geodjangofla',
     'ishtar_pdl',
@@ -242,12 +240,9 @@ except ImportError, e:
 
 TESTING = sys.argv[1:2] == ['test']
 
-if TESTING:
-    SOUTH_TESTS_MIGRATE = False
-
-    if USE_SPATIALITE_FOR_TESTS:
-        DATABASES['default']['ENGINE'] = \
-            'django.contrib.gis.db.backends.spatialite'
+if TESTING and USE_SPATIALITE_FOR_TESTS:
+    DATABASES['default']['ENGINE'] = \
+        'django.contrib.gis.db.backends.spatialite'
 
 PROJECT_SLUG = locals().get('PROJECT_SLUG', 'default')
 
-- 
cgit v1.2.3