From 236572e0f54e47fcf14ec35d292726253a20c30a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 16 Mar 2016 06:22:36 +0100 Subject: [PATCH] Check docs on Travis, take two We don't regenerate the authors there, as that doesn't work due to Travis cloning with --depth=50 --- scripts/dev/ci/travis_run.sh | 5 ++++- scripts/dev/src2asciidoc.py | 5 +++-- tox.ini | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh index ddedb0099..e4b0bb054 100644 --- a/scripts/dev/ci/travis_run.sh +++ b/scripts/dev/ci/travis_run.sh @@ -4,5 +4,8 @@ if [[ $DOCKER ]]; then docker build -t img misc/docker/$DOCKER docker run --privileged -v $PWD:/outside img else - tox -e $TESTENV + args=() + [[ $TESTENV == docs ]] && args=('--no-authors') + + tox -e $TESTENV "${args[@]}" fi diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py index 746a2ceaf..3b4660069 100755 --- a/scripts/dev/src2asciidoc.py +++ b/scripts/dev/src2asciidoc.py @@ -491,8 +491,9 @@ def main(): generate_settings('doc/help/settings.asciidoc') print("Generating command help...") generate_commands('doc/help/commands.asciidoc') - print("Generating authors in README...") - regenerate_authors('README.asciidoc') + if '--no-authors' not in sys.argv: + print("Generating authors in README...") + regenerate_authors('README.asciidoc') if '--html' in sys.argv: asciidoc2html.main() diff --git a/tox.ini b/tox.ini index 8aff26f7f..66875ebb2 100644 --- a/tox.ini +++ b/tox.ini @@ -202,7 +202,7 @@ deps = -r{toxinidir}/requirements.txt commands = {envpython} scripts/link_pyqt.py --tox {envdir} - {envpython} scripts/dev/src2asciidoc.py + {envpython} scripts/dev/src2asciidoc.py {posargs} {envpython} scripts/dev/check_doc_changes.py {envpython} scripts/asciidoc2html.py {posargs}