Skip to content

Commit

Permalink
Merge pull request #268 from pyca/docs-in-tox-2
Browse files Browse the repository at this point in the history
Add a tox environment for building documentation
  • Loading branch information
hynek committed May 27, 2015
2 parents 389f78b + 4cf77d2 commit cc44fcd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ matrix:

- python: "2.7"
env: TOXENV=pyroma

- python: "2.7"
env: TOXENV=docs

# Let the cryptography master builds fail because they might be triggered by
# cryptography changes beyond our control.
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def find_version(*file_paths):

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
html_theme = 'classic'

# 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
Expand Down
9 changes: 8 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,pyroma
envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,pyroma,docs

[testenv]
whitelist_externals =
Expand Down Expand Up @@ -43,3 +43,10 @@ deps =
check-manifest
commands =
check-manifest

[testenv:docs]
deps =
sphinx
basepython = python2.7
commands =
sphinx-build -W -b html doc doc/_build/html

0 comments on commit cc44fcd

Please sign in to comment.