diff options
author | Craig Citro <craigcitro@google.com> | 2015-03-02 23:44:53 -0800 |
---|---|---|
committer | Craig Citro <craigcitro@google.com> | 2015-03-02 23:55:15 -0800 |
commit | 07da0fecacff1dd06e643774c9487e3beda90b50 (patch) | |
tree | 2beb774d308a27db39489f97685af86dc4e0a11c /tox.ini | |
parent | 49a6d77a87a804cb354d60a806e0908e94965909 (diff) | |
download | oauth2client-07da0fecacff1dd06e643774c9487e3beda90b50.tar.gz |
Better doc building on travis.
This makes two changes:
* Force `tox` to use a new version of `sphinx`, since we depend on features
from the `1.3` branch.
* Tweak the `build-docs` script to build on any push. The logic for skipping
the build in the case of a non-master push was originally in place to
prevent new docs from being pushed live, but we opted to make that manual
instead. As a result, this just masks docs errors in pull requests.
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -42,7 +42,7 @@ deps = {[testenv:cover]deps} python-gflags pyyaml - sphinx + sphinx>=1.3b2 sphinx-rtd-theme commands = {toxinidir}/scripts/build-docs |