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

Mon Mar 28 19:46:26 EDT 2022

https://github.com/python/cpython/commit/0dfabf9b4a58b835b61fc3d17784d4746f677e56
commit: 0dfabf9b4a58b835b61fc3d17784d4746f677e56
branch: 3.10
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022年03月29日T00:46:18+01:00
summary:
bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms (GH-32161)
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
 )
