[Python-checkins] bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms (GH-32161)

miss-islington webhook-mailer at python.org
Mon Mar 28 20:10:54 EDT 2022


https://github.com/python/cpython/commit/d2c6a4428d52c108f4b06dcd1bb86023541c60ce
commit: d2c6a4428d52c108f4b06dcd1bb86023541c60ce
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-03-28T17:10:30-07:00
summary:

bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms (GH-32161)

(cherry picked from commit 0dfabf9b4a58b835b61fc3d17784d4746f677e56)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M Doc/make.bat

diff --git a/Doc/make.bat b/Doc/make.bat
index 7fde063642771..ac66b56e9a3ef 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -13,7 +13,7 @@ if not defined SPHINXBUILD (
     %PYTHON% -c "import sphinx" > nul 2> nul
     if errorlevel 1 (
         echo Installing sphinx with %PYTHON%
-        %PYTHON% -m pip install sphinx==2.2.0
+        %PYTHON% -m pip install -r requirements.txt
         if errorlevel 1 exit /B
     )
     set SPHINXBUILD=%PYTHON% -c "import sphinx.cmd.build, sys; sys.exit(sphinx.cmd.build.main())"
@@ -30,6 +30,7 @@ if not defined BLURB (
     %PYTHON% -c "import blurb" > nul 2> nul
     if errorlevel 1 (
         echo Installing blurb with %PYTHON%
+        rem Should have been installed with Sphinx earlier
         %PYTHON% -m pip install blurb
         if errorlevel 1 exit /B
     )



More information about the Python-checkins mailing list