Modernize sphinx

rapidsms · May 19, 2018 · e5e303c · e5e303c
1 parent 25099c1
commit e5e303c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/_ext/rapidsmsdocs.py b/docs/_ext/rapidsmsdocs.py
@@ -14,7 +14,7 @@
             json = None
 
 from sphinx import addnodes, roles
-from sphinx.util.compat import Directive
+from docutils.parsers.rst import Directive
 
 
 def setup(app):

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+extensions = ['rapidsmsdocs', 'sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

diff --git a/tox.ini b/tox.ini
@@ -38,11 +38,11 @@ commands = {toxinidir}/check_for_missing_migrations.sh
 
 [testenv:docs]
 basepython = python2.7
-deps = Sphinx>=1.3,<1.4
+deps = Sphinx>=1.7,<1.8
        Django>=1.11,<2.0
        {[default]deps}
 commands =
-    {envbindir}/sphinx-build -a -n -W -b html -d docs/_build/doctrees docs docs/_build/html
+    {envbindir}/sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html
 
 [testenv:flake8]
 basepython = python3.5