[Python-checkins] bpo-33673: Install python-docs-theme even if Sphinx is already installed (GH-7163)

Mon May 28 21:08:19 EDT 2018

https://github.com/python/cpython/commit/d8af8302430d85589df0a76d43dda9bac5be27c4
commit: d8af8302430d85589df0a76d43dda9bac5be27c4
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年05月28日T18:08:17-07:00
summary:
bpo-33673: Install python-docs-theme even if Sphinx is already installed (GH-7163)
(cherry picked from commit 3d3e66c2daebd8e6b18944eac7546168c0006c78)
Co-authored-by: Andrés Delfino <adelfino at gmail.com>
files:
M Doc/make.bat

diff --git a/Doc/make.bat b/Doc/make.bat
index c69cfae31941..3a4b365689db 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -13,7 +13,13 @@ 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-docs-theme
+ %PYTHON% -m pip install sphinx
+ if errorlevel 1 exit /B
+ )
+ %PYTHON% -c "import python_docs_theme" > nul 2> nul
+ if errorlevel 1 (
+ echo Installing python-docs-theme with %PYTHON%
+ %PYTHON% -m pip install python-docs-theme
 if errorlevel 1 exit /B
 )
 set SPHINXBUILD=%PYTHON% -c "import sphinx, sys; sys.argv[0] = 'sphinx-build'; sphinx.main()"
