Fix south error with django 1.7

theonion · Sep 10, 2014 · efe77d4 · efe77d4
1 parent 7c8fcd7
commit efe77d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/betty/__init__.py b/betty/__init__.py
@@ -2,4 +2,4 @@
 
 from .celery import app as celery_app  # noqa
 
-__version__ = "0.2.7"
+__version__ = "0.2.8"
diff --git a/betty/conf/server.py b/betty/conf/server.py
@@ -104,9 +104,14 @@
     'betty.cropper',
     'betty.authtoken',
     'betty.image_browser',
-    'south',
 )
 
+# Only use south with django < 1.7
+import django
+if django.VERSION < (1, 7):
+    INSTALLED_APPS = INSTALLED_APPS + ('south',)
+
+
 CELERY_IGNORE_RESULT = True
 CELERY_ALWAYS_EAGER = True
 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True