Ensure correct version of Sphinx is used for Windows builds (GH-20582)

miss-islington · zooba · web-flow · commit 139f1bafcf0b · 2020-06-01T14:25:32.000-07:00
(cherry picked from commit fe5dd78) Co-authored-by: Steve Dower <steve.dower@python.org>
diff --git 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
+        %PYTHON% -m pip install sphinx==2.2.0
         if errorlevel 1 exit /B
     )
     set SPHINXBUILD=%PYTHON% -c "import sphinx.cmd.build, sys; sys.exit(sphinx.cmd.build.main())"

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ if not defined SPHINXBUILD (`
`13`	`13`	`%PYTHON% -c "import sphinx" > nul 2> nul`
`14`	`14`	`if errorlevel 1 (`
`15`	`15`	`echo Installing sphinx with %PYTHON%`
`16`		`- %PYTHON% -m pip install sphinx`
	`16`	`+ %PYTHON% -m pip install sphinx==2.2.0`
`17`	`17`	`if errorlevel 1 exit /B`
`18`	`18`	`)`
`19`	`19`	`set SPHINXBUILD=%PYTHON% -c "import sphinx.cmd.build, sys; sys.exit(sphinx.cmd.build.main())"`