summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-09-30 10:58:35 -0400
committerMonty Taylor <mordred@inaugust.com>2013-09-30 10:59:26 -0400
commit9203a4d65b009716ecff82dfcd2744f762b80c27 (patch)
treeaccfa0b5b6028b9e0a48b5432d095253ee85cbe9
parent008fb370ec355011a048087f80fd154e886e4b6e (diff)
downloadoslo-version-9203a4d65b009716ecff82dfcd2744f762b80c27.tar.gz
Fix sphinx build
We're using oslo.sphinx now, we don't want to reference non-existing local themes. Change-Id: I29f6344d97b700add098e72d87aba8c47485293a
-rw-r--r--doc/source/conf.py6
-rw-r--r--tox.ini5
2 files changed, 4 insertions, 7 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 82fa87b..18a1d0d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -39,12 +39,6 @@ pygments_style = 'sphinx'
# -- Options for HTML output --------------------------------------------------
-# The theme to use for HTML and HTML Help pages. Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme_path = ["."]
-html_theme = '_theme'
-html_static_path = ['static']
-
# Output file base name for HTML help builder.
htmlhelp_basename = '%sdoc' % project
diff --git a/tox.ini b/tox.ini
index 45750db..b7a80b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
[tox]
+minversion = 1.6
+skipsdist = True
envlist = py26,py27,pep8
[testenv]
+usedevelop = True
+install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
LANG=en_US.UTF-8
LANGUAGE=en_US:en
@@ -11,7 +15,6 @@ commands =
python setup.py testr --testr-args='{posargs}'
[tox:jenkins]
-sitepackages = True
downloadcache = ~/cache/pip
[testenv:pep8]