aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2017-09-07 17:17:53 -0700
committerGitHub <noreply@github.com>2017-09-07 17:17:53 -0700
commit590665c399fc4aa3c4a9f8e7104d43a02e9f3a0c (patch)
treea4bc5681706799eb6b457336b510aa0d0200e5d5 /.gitignore
parentbpo-31344: Per-frame control of trace events (GH-3417) (diff)
downloadcpython-590665c399fc4aa3c4a9f8e7104d43a02e9f3a0c.tar.gz
cpython-590665c399fc4aa3c4a9f8e7104d43a02e9f3a0c.tar.bz2
cpython-590665c399fc4aa3c4a9f8e7104d43a02e9f3a0c.zip
bpo-31036: Allow sphinx and blurb to be found automatically (#3440)
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.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ea7abfe5599..59206541ee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@
.gdb_history
Doc/build/
Doc/venv/
+Doc/.venv/
+Doc/env/
+Doc/.env/
Include/pydtrace_probes.h
Lib/distutils/command/*.pdb
Lib/lib2to3/*.pickle