Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport36 doc fixes: PR#68 and PR#124 #125

Merged
merged 2 commits into from
Feb 15, 2017
Merged

Backport36 doc fixes: PR#68 and PR#124 #125

merged 2 commits into from
Feb 15, 2017

Conversation

vstinner
Copy link
Member

Fix "make -C Doc check": backport two fixes.

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)
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)
@vstinner vstinner changed the title Backport36 doc Backport36 doc fixes: PR#68 and PR#124 Feb 15, 2017
@vstinner
Copy link
Member Author

In my backport, I ignored changes on the .travis.yml file, since it doesn't exist in the 3.6 branch yet: see #25

@vstinner vstinner merged commit b300c66 into python:3.6 Feb 15, 2017
vstinner added a commit that referenced this pull request Feb 16, 2017
* 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)
@vstinner vstinner deleted the backport36_doc branch June 15, 2017 23:03
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
The changelog is now included in the documentation.

https://bitbucket.org/stackless-dev/stackless/issues/125
(grafted from 5df8e4bc45e7544e5af75547e11d29d0d8cca4c4)
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants