From 122fc136b34e11906466851e77bb6959946467ee Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 27 Nov 2017 17:07:32 -0500 Subject: Revert "bpo-30487: automatically create a venv and install Sphinx when running make (GH-4346)" (#4592) Fix breakage documented in bpo-32149. This reverts commit d8d6b9122134f040cd5a4f15f40f6c9e3386db4d. --- Doc/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'Doc/Makefile') diff --git a/Doc/Makefile b/Doc/Makefile index 69e7e2eece..307d1e0e7d 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -17,7 +17,7 @@ ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PA .PHONY: help build html htmlhelp latex text changes linkcheck \ suspicious coverage doctest pydoc-topics htmlview clean dist check serve \ - autobuild-dev autobuild-stable + autobuild-dev autobuild-stable venv help: @echo "Please use \`make ' where is one of" @@ -39,7 +39,7 @@ help: @echo " check to run a check for frequent markup errors" @echo " serve to serve the documentation on the localhost (8000)" -build: venv +build: -mkdir -p build # Look first for a Misc/NEWS file (building from a source release tarball # or old repo) and use that, otherwise look for a Misc/NEWS.d directory @@ -122,11 +122,9 @@ clean: -rm -rf build/* $(VENVDIR)/* venv: - @if [ "$(SPHINXBUILD)" == "PATH=$(VENVDIR)/bin:$$PATH sphinx-build" ]; then \ - $(PYTHON) -m venv $(VENVDIR); \ - echo "A virtual environment for Docs has been made in the $(VENVDIR) directory"; \ - $(VENVDIR)/bin/python3 -m pip install Sphinx blurb; \ - fi + $(PYTHON) -m venv $(VENVDIR) + $(VENVDIR)/bin/python3 -m pip install -U Sphinx blurb + @echo "The venv has been created in the $(VENVDIR) directory" dist: rm -rf dist -- cgit v1.2.1