diff --git a/buildout.cfg b/buildout.cfg index 10bcc70b9c42e780f28de235ec895427677652a4..5364b715b4d35e9d39b4dfbfb5b3a719a5b7ce57 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -19,13 +19,14 @@ django-rest-swagger = >=0.3.2 django-guardian = >=1.3 djangorestframework = >=3.2 django-activity-stream = >= 0.6.0 +sphinx = >= 1.4.1 [sysegg] recipe = syseggrecipe ;force-sysegg = true eggs = alabaster - appnope - Babel + babel + backports.shutil-get-terminal-size colorlog coverage cycler @@ -43,7 +44,6 @@ eggs = alabaster gevent graphviz greenlet - gnureadline ipdb ipython ipython-genutils @@ -52,13 +52,13 @@ eggs = alabaster jsonschema MarkupSafe matplotlib - mysqlclient mock + mysqlclient numpy oset pathlib2 - pexpect pbr + pexpect pickleshare pip psutil diff --git a/doc/admin/conf.py b/doc/admin/conf.py index 5c7ed127081b74b207ad41d61e5ba866a0ac152a..9155f7322b23b74a33d4686e0628702897d308b0 100644 --- a/doc/admin/conf.py +++ b/doc/admin/conf.py @@ -33,14 +33,14 @@ import pkg_resources # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +needs_sphinx = '1.4.1' # 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.todo', 'sphinx.ext.coverage', - 'sphinx.ext.pngmath', + 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig', 'sphinx.ext.autodoc', 'sphinx.ext.autosummary', diff --git a/doc/api/conf.py b/doc/api/conf.py index 7e21dad8522cd668c09b9050f664619dc1c8176d..acad5477e324a1ebb588f1e032e5c8b93af070ce 100644 --- a/doc/api/conf.py +++ b/doc/api/conf.py @@ -46,7 +46,7 @@ application = get_wsgi_application() # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -needs_sphinx = '1.3' +needs_sphinx = '1.4.1' # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. @@ -54,7 +54,7 @@ extensions = [ 'sphinx.ext.todo', 'sphinx.ext.coverage', - 'sphinx.ext.pngmath', + 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig', 'sphinx.ext.autodoc', 'sphinx.ext.autosummary', diff --git a/doc/user/conf.py b/doc/user/conf.py index 324bc71788f1e1d718dde0dab4a6bfd2b8c78017..b12dd3b5fe93aaadf699957692d60bcf843e64a0 100644 --- a/doc/user/conf.py +++ b/doc/user/conf.py @@ -39,14 +39,14 @@ import pkg_resources # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -needs_sphinx = '1.3' +needs_sphinx = '1.4.1' # 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.todo', 'sphinx.ext.coverage', - 'sphinx.ext.pngmath', + 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig', 'sphinx.ext.autodoc', 'sphinx.ext.autosummary', diff --git a/setup.py b/setup.py index c8c2b043b678d1234900cc8d4795f5149c824e26..1b7ac50604efe960ab6412295ab38a0ed8ebc2e6 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,6 @@ setup( "setuptools", "simplejson", "sphinx", - "sphinx-numfig", "sphinxcontrib-programoutput", "sphinxcontrib-ansi", "sphinxcontrib-httpdomain",