Staging
v0.8.1
https://github.com/python/cpython
Revision 645c1e421348790d49eab863279a41cb2b6a007a authored by Miss Islington (bot) on 08 September 2017, 00:38:31 UTC, committed by Ned Deily on 08 September 2017, 00:38:31 UTC
Rather than requiring the path to blurb and/or sphinx-build to be specified to the make rule, enhance the Doc/Makefile to look for each first in a virtual environment created by make venv and, if not found, look on the normal process PATH. This allows the Doc/Makefile to take advantage of an installed spinx-build or blurb and, thus, do the right thing most of the time. Also, make the directory for the venv be configurable and document the `make venv` target.
(cherry picked from commit 590665c399fc4aa3c4a9f8e7104d43a02e9f3a0c)
1 parent 9423f5d
Raw File
Tip revision: 645c1e421348790d49eab863279a41cb2b6a007a authored by Miss Islington (bot) on 08 September 2017, 00:38:31 UTC
[3.6] bpo-31036: Allow sphinx and blurb to be found automatically (GH-3440) (#3441)
Tip revision: 645c1e4
.hgeol
[patterns]

# Non human-editable files are binary

**.dsp  = BIN
**.dsw  = BIN
**.mk   = BIN
**.sln  = BIN
**.vcproj  = BIN
**.vsprops = BIN

**.aif  = BIN
**.aifc = BIN
**.aiff = BIN
**.au   = BIN
**.bmp  = BIN
**.db   = BIN
**.exe  = BIN
**.icns = BIN
**.gif  = BIN
**.ico  = BIN
**.info = BIN
**.jpg  = BIN
**.pck  = BIN
**.png  = BIN
**.psd  = BIN
**.tar  = BIN
**.wav  = BIN
**.whl  = BIN
**.xar  = BIN
**.zip  = BIN

Lib/test/cjkencodings/* = BIN
Lib/test/decimaltestdata/*.decTest = BIN
Lib/test/sndhdrdata/sndhdr.* = BIN
Lib/test/test_email/data/msg_26.txt = BIN
Lib/test/xmltestdata/* = BIN

Lib/venv/scripts/nt/* = BIN

Lib/test/coding20731.py = BIN

# Windows only zlib upstream file
Modules/zlib/zlib.map = CRLF

# Windows batch files work best with CRLF, there can be subtle problems with LF
**.bat = CRLF

# The Windows readme is likely to be read in Notepad, so make it readable
PCbuild/readme.txt = CRLF

# All other files (which presumably are human-editable) are "native".
# This must be the last rule!

** = native

[repository]
native = LF
back to top