diff --git a/doc/source/conf.py b/doc/source/conf.py index 879a2e1..5d37a6c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -11,8 +11,10 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys import os +import sys + +import sphinx_rtd_theme # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -30,7 +32,6 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.viewcode', - 'oslosphinx' ] todo_include_todos = True @@ -92,7 +93,10 @@ man_pages = [] # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'nature' +# html_theme = 'nature' +html_theme = "sphinx_rtd_theme" +html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] + # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/doc/source/specs b/doc/source/specs new file mode 120000 index 0000000..78c834f --- /dev/null +++ b/doc/source/specs @@ -0,0 +1 @@ +specs/ \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index f8a97b5..dd3741e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ docutils==0.9.1 -oslosphinx pbr>=0.6,<1.0 sphinx>=1.1.2,<1.2 +sphinx_rtd_theme testrepository>=0.0.18 -testtools>=0.9.34 \ No newline at end of file +testtools>=0.9.34 diff --git a/tox.ini b/tox.ini index 1046409..db2d0f2 100644 --- a/tox.ini +++ b/tox.ini @@ -8,10 +8,9 @@ usedevelop = True setenv = VIRTUAL_ENV={envdir} install_command = pip install -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:venv] commands = {posargs} [testenv:docs] -commands = python setup.py build_sphinx \ No newline at end of file +commands = python setup.py build_sphinx