Remove oslopshinx

Change-Id: Idcb18d717058452c04a39f6ded105d4b82393751
This commit is contained in:
Julien Danjou 2017-04-24 11:15:34 +02:00
parent 7b3a743244
commit 0f490476c9
3 changed files with 6 additions and 19 deletions

View File

@ -62,15 +62,10 @@ pygments_style = 'sphinx'
# html_theme_path = ["."]
# html_theme = '_theme'
# html_static_path = ['static']
html_theme = os.getenv("SPHINX_HTML_THEME", 'openstack')
html_theme = 'sphinx_rtd_theme'
if html_theme == "sphinx_rtd_theme":
import sphinx_rtd_theme
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
else:
import oslosphinx
html_theme_path = [os.path.join(os.path.dirname(oslosphinx.__file__),
'theme')]
import sphinx_rtd_theme
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
# Output file base name for HTML help builder.
htmlhelp_basename = '%sdoc' % project

View File

@ -89,7 +89,7 @@ test =
doc =
sphinx!=1.2.0,!=1.3b1,>=1.1.2
oslosphinx>=2.5.0 # Apache-2.0
sphinx_rtd_theme
openstack-doc-tools>=1.0.1

12
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
minversion = 1.6
envlist = py35,py36,py27,pypy,pep8,docs
envlist = py35,py36,py27,pypy,pep8,docs-gnocchi.xyz
skipsdist = True
[testenv]
@ -28,16 +28,8 @@ commands = {posargs}
[testenv:cover]
commands = python setup.py test --coverage --testr-args='{posargs}'
[testenv:docs]
deps = .[test,doc]
commands =
rm -rf doc/source/ref
python setup.py build_sphinx
[testenv:docs-gnocchi.xyz]
deps = .[test,doc]
sphinx_rtd_theme
setenv = SPHINX_HTML_THEME=sphinx_rtd_theme
commands =
python setup.py build_sphinx
@ -50,4 +42,4 @@ ignore =
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
[travis]
python = 3.6: py36, pep8, docs
python = 3.6: py36, pep8, docs-gnocchi.xyz