From bedc38d2494d147432fd8a3c264a1252b7d07f98 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:25:10 +0000 Subject: [PATCH 01/12] Update to Sphinx 5.3.0 --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 958665db69e227..55f5fe642006a3 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -3,7 +3,7 @@ # Sphinx version is pinned so that new versions that introduce new warnings # won't suddenly cause build failures. Updating the version is fine as long # as no warnings are raised by doing so. -sphinx==4.5.0 +sphinx==5.3.0 blurb From 4c2b811c6f920112c706e0c07880ed920ed5e0cd Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:13:10 +0100 Subject: [PATCH 02/12] Update to Sphinx 6.1.3 --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 55f5fe642006a3..36f7f0844adcc5 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -3,7 +3,7 @@ # Sphinx version is pinned so that new versions that introduce new warnings # won't suddenly cause build failures. Updating the version is fine as long # as no warnings are raised by doing so. -sphinx==5.3.0 +sphinx==6.1.3 blurb From 7816c8db82b8b387174d494e8ebed922fe934bb9 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:13:31 +0100 Subject: [PATCH 03/12] Temporary: Use git p-d-t --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 36f7f0844adcc5..0db82f741c1631 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -11,4 +11,4 @@ sphinx-lint==0.6.7 # The theme used by the documentation is stored separately, so we need # to install that as well. -python-docs-theme>=2022.1 +python-docs-theme@https://github.com/python/python-docs-theme/commit/aaca238208fcc91faa6572f1b9ee5d0eba787bb8 From 53ec41d8c2d736d8f1b47bbb6aab795c137f310b Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:19:38 +0100 Subject: [PATCH 04/12] Fix URL --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index fcab821db5f8e3..7bafc82f3b8f18 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -12,4 +12,4 @@ sphinxext-opengraph==0.7.5 # The theme used by the documentation is stored separately, so we need # to install that as well. -python-docs-theme@https://github.com/python/python-docs-theme/commit/aaca238208fcc91faa6572f1b9ee5d0eba787bb8 +python-docs-theme@git+https://github.com/python/python-docs-theme@aaca238208fcc91faa6572f1b9ee5d0eba787bb8 From 4ce7a419d7d678587debb243eec6649762403c25 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:53:55 +0100 Subject: [PATCH 05/12] Update to p-d-t PR 127 --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 7bafc82f3b8f18..63814d2b821b62 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -12,4 +12,4 @@ sphinxext-opengraph==0.7.5 # The theme used by the documentation is stored separately, so we need # to install that as well. -python-docs-theme@git+https://github.com/python/python-docs-theme@aaca238208fcc91faa6572f1b9ee5d0eba787bb8 +python-docs-theme@git+https://github.com/python/python-docs-theme@d39c3112a89023492d9f0efa9bdf7a51ca7f436d From 2486677825275a627de08584daa659575f83b6cc Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:59:16 +0100 Subject: [PATCH 06/12] Fix p-d-t PR 127 git install --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 63814d2b821b62..3a61c60aac6f81 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -12,4 +12,4 @@ sphinxext-opengraph==0.7.5 # The theme used by the documentation is stored separately, so we need # to install that as well. -python-docs-theme@git+https://github.com/python/python-docs-theme@d39c3112a89023492d9f0efa9bdf7a51ca7f436d +python-docs-theme@git+https://github.com/AA-Turner/python-docs-theme@d39c3112a89023492d9f0efa9bdf7a51ca7f436d From d35d2a27ecc877257055fa95d544229769b7762d Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 4 May 2023 12:50:25 +0100 Subject: [PATCH 07/12] Update import for Sphinx 6.1 --- Doc/tools/extensions/pyspecific.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py index d659a4a54b9d11..3640c3d86a2008 100644 --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -27,7 +27,7 @@ except ImportError: from sphinx.environment import NoUri from sphinx.locale import _ as sphinx_gettext -from sphinx.util import status_iterator, logging +from sphinx.util import logging from sphinx.util.docutils import SphinxDirective from sphinx.util.nodes import split_explicit_title from sphinx.writers.text import TextWriter, TextTranslator @@ -37,6 +37,12 @@ except ImportError: from sphinx.domains.python import PyClassmember as PyMethod from sphinx.domains.python import PyModulelevel as PyFunction +try: + # Sphinx 6.1 onwards + from sphinx.util.display import status_iterator +except ImportError: + # Before Sphinx 6.1 + from sphinx.util import status_iterator ISSUE_URI = 'https://bugs.python.org/issue?@action=redirect&bpo=%s' From 1ef1c614a9fe9d13d176521b822b0b1fe10f534e Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 4 May 2023 12:53:28 +0100 Subject: [PATCH 08/12] Bump to Sphinx 7 --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 79793a0e6fee17..ef28a4018325c5 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -6,7 +6,7 @@ # Sphinx version is pinned so that new versions that introduce new warnings # won't suddenly cause build failures. Updating the version is fine as long # as no warnings are raised by doing so. -sphinx==6.1.3 +sphinx==7.0.0 blurb From eeaf03a730a3dd0549498da879678b0e3b94482d Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Fri, 12 May 2023 23:21:29 +0100 Subject: [PATCH 09/12] Revert "Temporary: Use git p-d-t" This reverts commit 7816c8db --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index ef28a4018325c5..75a2163021f80f 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -15,6 +15,6 @@ sphinxext-opengraph==0.7.5 # The theme used by the documentation is stored separately, so we need # to install that as well. -python-docs-theme@git+https://github.com/AA-Turner/python-docs-theme@d39c3112a89023492d9f0efa9bdf7a51ca7f436d +python-docs-theme>=2022.1 -c constraints.txt From ff16c8acec88f31fe96f72dcd9dda2b9066098d4 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 6 Aug 2023 05:08:33 +0100 Subject: [PATCH 10/12] Bump to Sphinx 7.1 --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 099bb5d9c834a1..ee7b08c0324807 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -6,7 +6,7 @@ # Sphinx version is pinned so that new versions that introduce new warnings # won't suddenly cause build failures. Updating the version is fine as long # as no warnings are raised by doing so. -sphinx==7.0.0 +sphinx~=7.1.0 blurb From a227b46b0423401f1ede566e41f23858b85197b8 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Tue, 8 Aug 2023 21:06:09 +0100 Subject: [PATCH 11/12] Restore accidentally removed imports --- Doc/tools/extensions/pyspecific.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py index 8fdf34ea802eec..3cf4d236604bcb 100644 --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -21,6 +21,7 @@ from docutils.utils import new_document from sphinx import addnodes from sphinx.builders import Builder +from sphinx.domains.python import PyFunction, PyMethod from sphinx.errors import NoUri from sphinx.locale import _ as sphinx_gettext from sphinx.util import logging From e793f432c59a337df2402dea7e3e41530a56bff2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 21 Dec 2023 17:28:30 +0200 Subject: [PATCH 12/12] Bump to Sphinx 7.2 --- Doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 7b3ea29b11b28b..ab456ae578ca22 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -6,7 +6,7 @@ # Sphinx version is pinned so that new versions that introduce new warnings # won't suddenly cause build failures. Updating the version is fine as long # as no warnings are raised by doing so. -sphinx~=7.1.0 +sphinx~=7.2.0 blurb