Skip to content

gh-145455: Show output of blurb & sphinx-build version commands #145457

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

Merged
encukou merged 1 commit into from
Mar 3, 2026
+1 −1
Merged

gh-145455: Show output of blurb & sphinx-build version commands #145457

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
gh-145455: Show output of blurb & sphinx-build version commands 
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.

Switch `blurb` to output a version on a single line (`--version` rather
than `help`), and don't redirect stderr, to show warnings and failures.
Also, don't redirect stdout. This results in two extra lines with
version info, which get drowned in typical Sphinx output, and can be
helpful when debugging.
  • Loading branch information
@encukou
encukou committed Mar 3, 2026
commit bd86b7efb2d9cef2077bb8c701b8ae6c4919f5d9
2 changes: 1 addition & 1 deletion Doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
Loading