https://github.com/python/cpython/commit/0a239ddd39d2824c34ae34ccfff528af1c296bae
commit: 0a239ddd39d2824c34ae34ccfff528af1c296bae
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: encukou <[email protected]>
date: 2026-03-03T14:25:13+01:00
summary:

[3.13] gh-145455: Show output of blurb & sphinx-build version commands 
(GH-145457) (GH-145462)

In gh-145455, an outdated dependency caused an import error that was not
printed out (`2>&1`); the message instead said that the tools are missing.

Don't redirect stderr, to show warnings and failures.

Also, switch `blurb` to output a version on a single line (`--version` rather
than `help`), and, and don't redirect stdout either.
This results in two version info lines being printed out. These get drowned
in typical Sphinx output, and can be helpful when debugging.
(cherry picked from commit f1de65b3669226d563802a32b78a2294e971151a)

Co-authored-by: Petr Viktorin <[email protected]>

files:
M Doc/Makefile

diff --git a/Doc/Makefile b/Doc/Makefile
index 4d605980a62904..60ffcd286e3c82 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -58,7 +58,7 @@ build:
        @if [ -f  ../Misc/NEWS ] ; then \
                echo "Using existing Misc/NEWS file"; \
                cp ../Misc/NEWS build/NEWS; \
-       elif $(BLURB) help >/dev/null 2>&1 && $(SPHINXBUILD) --version 
>/dev/null 2>&1; then \
+       elif $(BLURB) --version && $(SPHINXBUILD) --version ; then \
                if [ -d ../Misc/NEWS.d ]; then \
                        echo "Building NEWS from Misc/NEWS.d with blurb"; \
                        $(BLURB) merge -f build/NEWS; \

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

Reply via email to