Feb 10, 2022 · Feb 3, 2022 · Feb 3, 2022 · Feb 3, 2022 · Feb 7, 2022 · Feb 7, 2022
diff --git a/Doc/Makefile b/Doc/Makefile
 PYTHON       = python3
 VENVDIR      = ./venv
 SPHINXBUILD  = PATH=$(VENVDIR)/bin:$$PATH sphinx-build
 SPHINXLINT   = PATH=$(VENVDIR)/bin:$$PATH sphinx-lint
 BLURB        = PATH=$(VENVDIR)/bin:$$PATH blurb
 PAPER        =
 SOURCES      =
 rm dist/python-$(DISTVERSION)-docs-texinfo.tar

 check:
 $(PYTHON) tools/rstlint.py -i tools -i $(VENVDIR) -i README.rst
 $(PYTHON) tools/rstlint.py ../Misc/NEWS.d/next/
 $(SPHINXLINT) -i tools -i $(VENVDIR) -i README.rst
 $(SPHINXLINT) ../Misc/NEWS.d/next/

 serve:
 $(PYTHON) ../Tools/scripts/serve.py build/html $(SERVE_PORT)
diff --git a/Doc/make.bat b/Doc/make.bat
    set BLURB=%PYTHON% -m blurb
 )

 if not defined SPHINXLINT (
    %PYTHON% -c "import sphinxlint" > nul 2> nul
    if errorlevel 1 (
        echo Installing sphinx-lint with %PYTHON%
        %PYTHON% -m pip install sphinx-lint
        if errorlevel 1 exit /B
    )
    set SPHINXLINT=%PYTHON% -m sphinxlint
 )

 if "%1" NEQ "htmlhelp" goto :skiphhcsearch
 if exist "%HTMLHELP%" goto :skiphhcsearch

 goto end

 :check
 cmd /S /C "%PYTHON% tools\rstlint.py -i tools"
 cmd /S /C "%SPHINXLINT% -i tools"
 goto end

 :serve
diff --git a/Doc/requirements.txt b/Doc/requirements.txt

 blurb

 sphinx-lint<1

 # The theme used by the documentation is stored separately, so we need
 # to install that as well.
 python-docs-theme>=2022.1
diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py

    count = defaultdict(int)

    print("""⚠ rstlint.py is no longer maintained here and will be removed
 ⚠ in a future release.
 ⚠ Please use https://pypi.org/p/sphinx-lint instead.
 """)

    for root, dirs, files in os.walk(path):
        # ignore subdirs in ignore list
        if abspath(root) in ignore:
diff --git a/Misc/NEWS.d/next/Documentation/2022-02-03-11-24-59.bpo-42238.yJcMa8.rst b/Misc/NEWS.d/next/Documentation/2022-02-03-11-24-59.bpo-42238.yJcMa8.rst
 ``Doc/tools/rstlint.py`` has moved to its own repository and is now packaged
 on PyPI as ``sphinx-lint``.
diff --git a/Misc/NEWS.d/next/Library/2022-02-06-08-54-03.bpo-46655.DiLzYv.rst b/Misc/NEWS.d/next/Library/2022-02-06-08-54-03.bpo-46655.DiLzYv.rst
 In:func:`typing.get_type_hints`, support evaluating bare stringified ``TypeAlias`` annotations. Patch by Gregory Beauregard.
 In:func:`typing.get_type_hints`, support evaluating bare stringified ``TypeAlias`` annotations. Patch by Gregory Beauregard.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,7 @@
		PYTHON = python3
		VENVDIR = ./venv
		SPHINXBUILD = PATH=$(VENVDIR)/bin:$$PATH sphinx-build
		SPHINXLINT = PATH=$(VENVDIR)/bin:$$PATH sphinx-lint
		BLURB = PATH=$(VENVDIR)/bin:$$PATH blurb
		PAPER =
		SOURCES =
Expand DownExpand Up		@@ -214,8 +215,8 @@ dist:
		rm dist/python-$(DISTVERSION)-docs-texinfo.tar

		check:
		$(PYTHON) tools/rstlint.py -i tools -i $(VENVDIR) -i README.rst
		$(PYTHON) tools/rstlint.py ../Misc/NEWS.d/next/
		$(SPHINXLINT) -i tools -i $(VENVDIR) -i README.rst
		$(SPHINXLINT) ../Misc/NEWS.d/next/

		serve:
		$(PYTHON) ../Tools/scripts/serve.py build/html $(SERVE_PORT)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,6 +36,16 @@ if not defined BLURB (
		set BLURB=%PYTHON% -m blurb
		)

		if not defined SPHINXLINT (
		%PYTHON% -c "import sphinxlint" > nul 2> nul
		if errorlevel 1 (
		echo Installing sphinx-lint with %PYTHON%
		%PYTHON% -m pip install sphinx-lint
		if errorlevel 1 exit /B
		)
		set SPHINXLINT=%PYTHON% -m sphinxlint
		)

		if "%1" NEQ "htmlhelp" goto :skiphhcsearch
		if exist "%HTMLHELP%" goto :skiphhcsearch

Expand DownExpand Up		@@ -168,7 +178,7 @@ if EXIST "%BUILDDIR%\html\index.html" (
		goto end

		:check
		cmd /S /C "%PYTHON% tools\rstlint.py -i tools"
		cmd /S /C "%SPHINXLINT% -i tools"
		goto end

		:serve
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,8 @@ sphinx==4.2.0

		blurb

		sphinx-lint<1

		# The theme used by the documentation is stored separately, so we need
		# to install that as well.
		python-docs-theme>=2022.1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -345,6 +345,11 @@ def main(argv):

		count = defaultdict(int)

		print("""⚠ rstlint.py is no longer maintained here and will be removed
		⚠ in a future release.
		⚠ Please use https://pypi.org/p/sphinx-lint instead.
		""")

		for root, dirs, files in os.walk(path):
		# ignore subdirs in ignore list
		if abspath(root) in ignore:
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		``Doc/tools/rstlint.py`` has moved to its own repository and is now packaged
		on PyPI as ``sphinx-lint``.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		In:func:`typing.get_type_hints`, support evaluating bare stringified ``TypeAlias`` annotations. Patch by Gregory Beauregard.
		In:func:`typing.get_type_hints`, support evaluating bare stringified ``TypeAlias`` annotations. Patch by Gregory Beauregard.