Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
miss-islington wants to merge 1 commit into from
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Doc/make.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@ned-deily ned-deily Mar 29, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 3.7 branch does not have a requirements.txt for the Doc venv.

@zooba zooba Mar 29, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah, I should've been checking that as I backported. Looks like it's a different fix for this version (and 3.8)

if errorlevel 1 exit /B
)
set SPHINXBUILD=%PYTHON% -c "import sphinx.cmd.build, sys; sys.exit(sphinx.cmd.build.main())"
Expand All @@ -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
)
Expand Down