From 886dfe5928b86a63b8b8caa10ca4e160952d23c1 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 25 Jun 2022 16:01:56 +0200 Subject: [PATCH 1/7] Turn warnings into errors in the Makefile. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2e8f83b65..73df7314c 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,13 @@ SPHINXOPTS = SPHINXBUILD = $(VENVDIR)/bin/sphinx-build SPHINXLINT = $(VENVDIR)/bin/sphinx-lint PAPER = +SPHINXERRORHANDLING = -W # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) \ + $(SPHINXOPTS) $(SPHINXERRORHANDLING) . .PHONY: help venv clean html dirhtml singlehtml pickle json htmlhelp qthelp \ devhelp epub latex latexpdf text man changes linkcheck doctest htmlview check From 83a5b7778a30147f65ec742d437de85a812ee717 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 25 Jun 2022 16:07:34 +0200 Subject: [PATCH 2/7] Restore missing label. --- gitbootcamp.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitbootcamp.rst b/gitbootcamp.rst index 5d5de8161..36db80e69 100644 --- a/gitbootcamp.rst +++ b/gitbootcamp.rst @@ -184,6 +184,8 @@ rename your local branch as follows:: git branch -u upstream/main main +.. _commit-changes: + Staging and Committing Files ---------------------------- From f4f755d254251c9b4ea09a7c2453c79ebad2c98e Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 25 Jun 2022 22:09:05 +0200 Subject: [PATCH 3/7] Add `--keep-going`. Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 73df7314c..5b0680b9c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SPHINXOPTS = SPHINXBUILD = $(VENVDIR)/bin/sphinx-build SPHINXLINT = $(VENVDIR)/bin/sphinx-lint PAPER = -SPHINXERRORHANDLING = -W +SPHINXERRORHANDLING = -W --keep-going # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 From 8b0b957fdbee9e540d4a0d688ed59df02f2f67b0 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sun, 26 Jun 2022 19:12:16 +0200 Subject: [PATCH 4/7] Add `-W --keep-going -n` to SPHINXOPTS. --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5b0680b9c..b2e5a707b 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,15 @@ PYTHON = python3 VENVDIR = ./venv BUILDDIR = _build -SPHINXOPTS = +SPHINXOPTS = -W --keep-going -n SPHINXBUILD = $(VENVDIR)/bin/sphinx-build SPHINXLINT = $(VENVDIR)/bin/sphinx-lint PAPER = -SPHINXERRORHANDLING = -W --keep-going # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) \ - $(SPHINXOPTS) $(SPHINXERRORHANDLING) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help venv clean html dirhtml singlehtml pickle json htmlhelp qthelp \ devhelp epub latex latexpdf text man changes linkcheck doctest htmlview check From 7e4049343d2fba99532da544f4ec856bca051289 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sun, 26 Jun 2022 19:14:34 +0200 Subject: [PATCH 5/7] Fix a warning in conf.py. --- conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.py b/conf.py index 422de53bb..7e754536a 100644 --- a/conf.py +++ b/conf.py @@ -224,7 +224,7 @@ # http://www.sphinx-doc.org/en/stable/config.html?highlight=linkcheck#confval-linkcheck_anchors_ignore linkcheck_anchors_ignore = [ # match any anchor that starts with a '/' since this is an invalid HTML anchor - '\/.*', + r'\/.*', ] linkcheck_ignore = [ From e7a517fef933d7fba580f584c4740cc7ba96877b Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 12 Jul 2022 01:50:35 +0200 Subject: [PATCH 6/7] Update `make.bat`. --- make.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/make.bat b/make.bat index ca3ac39d8..14fdcc492 100644 --- a/make.bat +++ b/make.bat @@ -22,6 +22,7 @@ if not defined SPHINXLINT ( ) set BUILDDIR=_build +set SPHINXOPTS="-W --keep-going -n" set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . if NOT "%PAPER%" == "" ( set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% From 1c25e62d528b150d9d72d4707759c10dc5acd4a7 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 12 Jul 2022 04:19:12 +0200 Subject: [PATCH 7/7] Unquote variable in make.bat. Co-authored-by: CAM Gerlach --- make.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.bat b/make.bat index 14fdcc492..ca36135f5 100644 --- a/make.bat +++ b/make.bat @@ -22,7 +22,7 @@ if not defined SPHINXLINT ( ) set BUILDDIR=_build -set SPHINXOPTS="-W --keep-going -n" +set SPHINXOPTS=-W --keep-going -n set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . if NOT "%PAPER%" == "" ( set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%