summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-02-13 14:30:05 (GMT)
committerGitHub <noreply@github.com>2017-02-13 14:30:05 (GMT)
commit2b501866ed493758e4c4b29f0ce9b24023d910a1 (patch)
treee9220e382de69fb999bd010de2e50be3b64aebc8
parent3d707be950b387552585451071928e7b39cdfa53 (diff)
downloadcpython-2b501866ed493758e4c4b29f0ce9b24023d910a1.zip
cpython-2b501866ed493758e4c4b29f0ce9b24023d910a1.tar.gz
cpython-2b501866ed493758e4c4b29f0ce9b24023d910a1.tar.bz2
Travis CI: run rstlint.py in the docs job (#68)
Currently, http://buildbot.python.org/all/buildslaves/ware-docs buildbot is only run as post-commit. For example, bpo-29521 (PR#41) introduced two warnings, unnotified by the Travis CI docs job. Modify the docs job to run toosl/rstlint.py. Fix also the two minor warnings which causes the buildbot slave to fail.
-rw-r--r--.travis.yml1
-rw-r--r--Doc/faq/windows.rst4
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 1066e5f..90d19d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ matrix:
- make venv PYTHON=python3
script:
- make html SPHINXBUILD="./venv/bin/python3 -m sphinx" SPHINXOPTS="-q"
+ - python3 tools/rstlint.py -i tools -i venv
- os: linux
language: c
compiler: clang
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index b9b7b8d..6ac83e4 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -300,9 +300,9 @@ this respect, and is easily configured to use spaces: Take :menuselection:`Tools
--> Options --> Tabs`, and for file type "Default" set "Tab size" and "Indent
size" to 4, and select the "Insert spaces" radio button.
-Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs
+Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs
and spaces are causing problems in leading whitespace.
-You may also run the :mod:`tabnanny` module to check a directory tree
+You may also run the :mod:`tabnanny` module to check a directory tree
in batch mode.