X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=f4d0835b8df88b4092a1ea0cb8ca14fd75afe822;hb=ac47efec05b3820415bd26507e4b7fc520c6ebd6;hp=8c3f49e1077524dc85d41b7727576af09ee398be;hpb=c4824dd65364b1ba6c9d3f45a9b6298dfafad0bc;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 8c3f49e1..f4d0835b 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -249,8 +249,6 @@ INSTALLED_APPS = [
     'plugins',
     # views - more or less stable 
     'ui',
-    # managing database migrations
-    'south', 
     # Uncomment the next line to enable the admin:
      'django.contrib.admin',
 	# FORGE Plugin app
@@ -259,8 +257,16 @@ INSTALLED_APPS = [
     # 'django.contrib.admindocs',
     'portal',
 ]
+# with django-1.7 we leave south and use native migrations
+# managing database migrations
+import django
+major, minor, _, _, _ = django.VERSION
+if major == 1 and minor <= 6:
+    INSTALLED_APPS.append('south')
+
 # this app won't load in a build environment
-if not building: INSTALLED_APPS.append ('rest')
+if not building:
+    INSTALLED_APPS.append ('rest')
 
 for component in components.list() :
     INSTALLED_APPS.append(component)