Commit e5184e9d authored by André Anjos's avatar André Anjos 💬

Merge branch 'scheduler' of gitlab.idiap.ch:beat/beat.web into scheduler

parents a71e4097 7ff5fad2
......@@ -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
......
......@@ -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',
......
......@@ -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',
......
......@@ -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',
......
......@@ -66,7 +66,6 @@ setup(
"setuptools",
"simplejson",
"sphinx",
"sphinx-numfig",
"sphinxcontrib-programoutput",
"sphinxcontrib-ansi",
"sphinxcontrib-httpdomain",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment