Revert "Fix docs build with Django 1.9"

graphite-project · Dec 8, 2015 · e1361f8 · e1361f8
1 parent b396c79
commit e1361f8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -25,13 +25,6 @@
 from graphite import settings
 settings.LOG_DIR = os.path.abspath('.')
 
-try:
-    from django import setup
-except ImportError:
-    pass
-else:
-    setup()
-
 # Bring in the new ReadTheDocs sphinx theme
 import sphinx_rtd_theme
 

diff --git a/tox.ini b/tox.ini
@@ -39,7 +39,7 @@ deps =
 	pytz
 	git+git://github.com/graphite-project/whisper.git#egg=whisper
 	git+git://github.com/graphite-project/ceres.git#egg=ceres
-	Django
+	Django<1.9
 	pyparsing
 	Sphinx
 	sphinx_rtd_theme