Skip to content

Commit

Permalink
Backport35 doc fixes: PR#68 and PR#124 (#125) (#126)
Browse files Browse the repository at this point in the history
* 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.
(cherry picked from commit 2b50186)

* Doc/Makefile: set PYTHON to python3 (#124)

rstlint.py run by "make check" doesn't support Python 2.

"make venv" runs "$(PYTHON) -m venv", whereas Python 2 doens't
provide the venv module: it's a module of Python 3 standard library.

(cherry picked from commit 91b0e7d)
(cherry picked from commit b300c66)
  • Loading branch information
vstinner authored Feb 16, 2017
1 parent de553b8 commit 5e04dfe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# You can set these variables from the command line.
PYTHON = python
PYTHON = python3
SPHINXBUILD = sphinx-build
PAPER =
SOURCES =
Expand Down
4 changes: 2 additions & 2 deletions Doc/faq/windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down

0 comments on commit 5e04dfe

Please sign in to comment.