diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-08-06 19:15:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-06 19:15:54 (GMT) |
| commit | 1e9c9ca570ffe92dc6a60825c2f9c91865129b8f (patch) | |
| tree | 77b745f945b25fcdf5b65441ba95b330b0de35d3 | |
| parent | 2b1e713f877102bbca299f0f5d7db969d78db49f (diff) | |
| download | cpython-1e9c9ca570ffe92dc6a60825c2f9c91865129b8f.zip cpython-1e9c9ca570ffe92dc6a60825c2f9c91865129b8f.tar.gz cpython-1e9c9ca570ffe92dc6a60825c2f9c91865129b8f.tar.bz2 | |
bpo-44756: [docs] revert automated virtual environment creation on `make html` (GH-27635)
It turned out to be disruptive for downstream distributors.
(cherry picked from commit 55fa87b1ef46bbb9db7612b2dc2dd7fb039d9bc3)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
| -rw-r--r-- | Doc/Makefile | 5 | ||||
| -rw-r--r-- | Doc/README.rst | 13 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst | 3 |
3 files changed, 16 insertions, 5 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index ac02bbc..24528a1 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -45,7 +45,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 @@ -145,7 +145,8 @@ clean-venv: venv: @if [ -d $(VENVDIR) ] ; then \ - echo "venv already exists"; \ + echo "venv already exists."; \ + echo "To recreate it, remove it first with \`make clean-venv'."; \ else \ $(PYTHON) -m venv $(VENVDIR); \ $(VENVDIR)/bin/python3 -m pip install -U pip setuptools; \ diff --git a/Doc/README.rst b/Doc/README.rst index 20c0432..7e8a27b 100644 --- a/Doc/README.rst +++ b/Doc/README.rst @@ -29,13 +29,20 @@ Using make ---------- To get started on UNIX, you can create a virtual environment and build -documentation with the command:: +documentation with the commands:: + make venv make html The virtual environment in the ``venv`` directory will contain all the tools -necessary to build the documentation. You can also configure where the virtual -environment directory will be with the ``VENVDIR`` variable. +necessary to build the documentation downloaded and installed from PyPI. +If you'd like to create the virtual environment in a different location, +you can specify it using the ``VENVDIR`` variable. + +You can also skip creating the virtual environment altogether, in which case +the Makefile will look for instances of ``sphinxbuild`` and ``blurb`` +installed on your process ``PATH`` (configurable with the ``SPHINXBUILD`` and +``BLURB`` variables). On Windows, we try to emulate the Makefile as closely as possible with a ``make.bat`` file. If you need to specify the Python interpreter to use, diff --git a/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst new file mode 100644 index 0000000..ca2e1b9 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2021-08-06-19-36-21.bpo-44756.1Ngzon.rst @@ -0,0 +1,3 @@ +Reverted automated virtual environment creation on ``make html`` when +building documentation. It turned out to be disruptive for downstream +distributors. |