Repository: libcloud Updated Branches: refs/heads/trunk fbd9eb63e -> 2a2d6f574
Don't build API docs on Travis since it's causing build failures. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/2a2d6f57 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/2a2d6f57 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/2a2d6f57 Branch: refs/heads/trunk Commit: 2a2d6f574ec05b8be168a2eec544c1affbc5b7dd Parents: fbd9eb6 Author: Tomaz Muraus <[email protected]> Authored: Sun Jan 3 22:14:31 2016 +0800 Committer: Tomaz Muraus <[email protected]> Committed: Sun Jan 3 22:14:31 2016 +0800 ---------------------------------------------------------------------- .travis.yml | 2 +- docs/conf.py | 17 ----------------- tox.ini | 10 ++++++++++ 3 files changed, 11 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/2a2d6f57/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 8443a04..8580645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: env: ENV=lint before_script: TOX_ENV=lint - python: 2.7 - env: ENV=docs + env: ENV=docs-travis before_script: TOX_ENV=docs install: http://git-wip-us.apache.org/repos/asf/libcloud/blob/2a2d6f57/docs/conf.py ---------------------------------------------------------------------- diff --git a/docs/conf.py b/docs/conf.py index 1bb0f77..d1f730c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,7 +13,6 @@ import os import sys -import glob import subprocess from sphinx.environment import BuildEnvironment @@ -32,22 +31,6 @@ if on_rtd: cmd = 'sphinx-apidoc -d 3 -o apidocs/ ../libcloud/' subprocess.call(cmd, shell=True) -if on_travis: - # Hack, we can't use "exclude_patterns" since then api docs won't - # get published on readthedocs - api_docs_files = glob.glob(os.path.join(BASE_DIR, 'apidocs/') + '*.rst') - - for file_path in api_docs_files: - with open(file_path, 'r') as fp: - content = fp.read() - - if ':orphan:' in content: - continue - - new_content = ':orphan:\n\n' + content - with open(file_path, 'w') as fp: - fp.write(new_content) - # 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 # documentation root, use os.path.abspath to make it absolute, like shown here. http://git-wip-us.apache.org/repos/asf/libcloud/blob/2a2d6f57/tox.ini ---------------------------------------------------------------------- diff --git a/tox.ini b/tox.ini index 29dc779..fd65596 100644 --- a/tox.ini +++ b/tox.ini @@ -29,6 +29,16 @@ commands = python ../contrib/generate_provider_feature_matrix_table.py sphinx-apidoc -d 2 ../libcloud/ -o apidocs/ sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html +[testenv:docs-travis] +# Note: We don't build API docs on Travis since it causes build failures because +# those API docs files are not included anywhere. +deps = sphinx + pysphere + backports.ssl_match_hostname +changedir = docs +commands = python ../contrib/generate_provider_feature_matrix_table.py + sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html + [testenv:scrape-ec2-prices] deps = requests demjson
