Post 3.10.20

diff --git a/Doc/Makefile b/Doc/Makefile
index ac8f909a1f9143f060857f5c017a2bdfebfe2a89..dc800b27fb9596cfdc27261d1fd6fc276e239802 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -8,7 +8,9 @@ PYTHON       = python3
 VENVDIR      = ./venv
 SPHINXBUILD  = PATH=$(VENVDIR)/bin:$$PATH sphinx-build
 BLURB        = PATH=$(VENVDIR)/bin:$$PATH blurb
-JOBS         = auto
+# Sphinx 3.4 parallel reading fails under newer Python multiprocessing.
+# Keep builds serial by default; callers can still override (e.g. JOBS=auto).
+JOBS         = 1
 PAPER        =
 SOURCES      =
 DISTVERSION  = $(shell $(PYTHON) tools/extensions/patchlevel.py)
@@ -170,6 +172,7 @@ dist:
 .PHONY: dist-html
 dist-html:
        # archive the HTML
+       mkdir -p dist
        make html
        cp -pPR build/html dist/python-$(DISTVERSION)-docs-html
        tar -C dist -cf dist/python-$(DISTVERSION)-docs-html.tar python-$(DISTVERSION)-docs-html
@@ -181,6 +184,7 @@ dist-html:
 .PHONY: dist-text
 dist-text:
        # archive the text build
+       mkdir -p dist
        make text
        cp -pPR build/text dist/python-$(DISTVERSION)-docs-text
        tar -C dist -cf dist/python-$(DISTVERSION)-docs-text.tar python-$(DISTVERSION)-docs-text
@@ -192,6 +196,7 @@ dist-text:
 .PHONY: dist-pdf
 dist-pdf:
        # archive the A4 latex
+       mkdir -p dist
        rm -rf build/latex
        make latex PAPER=a4
        -sed -i 's/makeindex/makeindex -q/' build/latex/Makefile
@@ -210,6 +215,7 @@ dist-pdf:
 .PHONY: dist-epub
 dist-epub:
        # copy the epub build
+       mkdir -p dist
        rm -rf build/epub
        make epub
        cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub
@@ -217,6 +223,7 @@ dist-epub:
 .PHONY: dist-texinfo
 dist-texinfo:
        # archive the texinfo build
+       mkdir -p dist
        rm -rf build/texinfo
        make texinfo
        make info --directory=build/texinfo

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index e86e4f03e0ad9311bc42347e14196a57a8d0abea..263439b03e24c8189d2aaf39f1361860492ac99b 100644 (file)
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,7 +23,7 @@
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.10.20"
+#define PY_VERSION              "3.10.20+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.