bpo-36329: Remove 'make -C Doc serve' in favour of 'make -C Doc htmlview'

hugovk · hugovk · commit 38747aec7186 · 2022-04-06T12:07:36.000+03:00
diff --git a/Doc/Makefile b/Doc/Makefile
@@ -13,7 +13,6 @@ PAPER        =
 SOURCES      =
 DISTVERSION  = $(shell $(PYTHON) tools/extensions/patchlevel.py)
 SPHINXERRORHANDLING = -W
-SERVE_PORT   =
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_elements.papersize=a4paper
@@ -23,7 +22,7 @@ ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees $(PAPEROPT_$(PAPER)) \
                 $(SPHINXOPTS) $(SPHINXERRORHANDLING) . build/$(BUILDER) $(SOURCES)
 
 .PHONY: help build html htmlhelp latex text texinfo changes linkcheck \
-	suspicious coverage doctest pydoc-topics htmlview clean dist check serve \
+	suspicious coverage doctest pydoc-topics htmlview clean dist check \
 	autobuild-dev autobuild-stable venv
 
 help:
@@ -45,7 +44,6 @@ help:
 	@echo "  dist       to create a \"dist\" directory with archived docs for download"
 	@echo "  suspicious to check for suspicious markup in output text"
 	@echo "  check      to run a check for frequent markup errors"
-	@echo "  serve      to serve the documentation on the localhost (8000)"
 
 build:
 	-mkdir -p build
@@ -218,9 +216,6 @@ check:
 	$(SPHINXLINT) -i tools -i $(VENVDIR) -i README.rst
 	$(SPHINXLINT) ../Misc/NEWS.d/next/
 
-serve:
-	$(PYTHON) ../Tools/scripts/serve.py build/html $(SERVE_PORT)
-
 # Targets for daily automated doc build
 # By default, Sphinx only rebuilds pages where the page content has changed.
 # This means it doesn't always pick up changes to preferred link targets, etc
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
@@ -782,7 +782,3 @@ This is a working "Hello World" WSGI application::
        httpd.serve_forever()
 
 
-Example of a WSGI application serving the current directory, accept optional
-directory and port number (default: 8000) on the command line:
-
-.. literalinclude:: ../../Tools/scripts/serve.py
diff --git a/Doc/make.bat b/Doc/make.bat
@@ -74,7 +74,6 @@ rem Targets that don't require sphinx-build
 if "%1" EQU "" goto help
 if "%1" EQU "help" goto help
 if "%1" EQU "check" goto check
-if "%1" EQU "serve" goto serve
 if "%1" == "clean" (
     rmdir /q /s "%BUILDDIR%"
     goto end
@@ -111,7 +110,7 @@ echo.   Provided by Sphinx:
 echo.      html, htmlhelp, latex, text
 echo.      suspicious, linkcheck, changes, doctest
 echo.   Provided by this script:
-echo.      clean, check, serve, htmlview
+echo.      clean, check, htmlview
 echo.
 echo.All arguments past the first one are passed through to sphinx-build as
 echo.filenames to build or are ignored.  See README.rst in this directory or
@@ -183,9 +182,5 @@ goto end
 cmd /S /C "%SPHINXLINT% -i tools"
 goto end
 
-:serve
-cmd /S /C "%PYTHON% ..\Tools\scripts\serve.py "%BUILDDIR%\html""
-goto end
-
 :end
 popd
diff --git a/Misc/NEWS.d/next/Documentation/2022-04-06-11-53-41.bpo-36329.EVtAtK.rst b/Misc/NEWS.d/next/Documentation/2022-04-06-11-53-41.bpo-36329.EVtAtK.rst
@@ -0,0 +1 @@
+Remove 'make -C Doc serve' in favour of 'make -C Doc htmlview'
diff --git a/Tools/scripts/README b/Tools/scripts/README
@@ -57,7 +57,6 @@ reindent.py               Change .py files to use 4-space indents
 reindent-rst.py           Fix-up reStructuredText file whitespace
 rgrep.py                  Reverse grep through a file (useful for big logfiles)
 run_tests.py              Run the test suite with more sensible default options
-serve.py                  Small wsgiref-based web server, used in make serve in Doc
 stable_abi.py             Stable ABI checks and file generators.
 suff.py                   Sort a list of files by suffix
 texi2html.py              Convert GNU texinfo files into HTML
diff --git a/Tools/scripts/serve.py b/Tools/scripts/serve.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Remove 'make -C Doc serve' in favour of 'make -C Doc htmlview'`