Merge pull request #3907 from yakky/feature/optional_south

Mark south as optional dependency
django-cms · Mar 1, 2015 · c52ce48 · c52ce48
2 parents 27a1aca + d9e712f
commit c52ce48
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -328,4 +328,5 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - Remove django-mptt in favor of django-treebeard
 - Remove compatibility with Django 1.4 / 1.5
 - General code cleanup
-- Simplify loading of view restrictions in the menu
+- Simplify loading of view restrictions in the menu
+- south is not marked as optional; to use south on Django 1.6 install django-cms[south]
diff --git a/docs/upgrade/3.1.rst b/docs/upgrade/3.1.rst
@@ -30,6 +30,13 @@ Dropped support for Django 1.4 and 1.5
 Starting from version 3.1 the supported Django versions are 1.6 and 1.7
 
 
+South is now an optional dependency
+===================================
+
+As south is now required for Django 1.6 only, it's marked as an optional dependency.
+To install south along with django CMS use ``pip install django-cms[south]``.
+
+
 ********************
 Incompatible changes
 ********************

diff --git a/setup.py b/setup.py
@@ -32,14 +32,16 @@
     platforms=['OS Independent'],
     classifiers=CLASSIFIERS,
     install_requires=[
-        'Django>=1.4',
+        'Django>=1.6',
         'django-classy-tags>=0.5',
-        'south>=0.7.2',
         'html5lib',
         'django-treebeard==3.0',
         'django-sekizai>=0.7',
         'djangocms-admin-style'
     ],
+    extras_require={
+        'south': ['south>=1.0.0'],
+    },
     packages=find_packages(exclude=["project", "project.*"]),
     include_package_data=True,
     zip_safe=False,