Skip to content

GH-99380: Update to Sphinx 7 #99381

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
AA-Turner merged 19 commits into from
Jan 20, 2024
Merged

GH-99380: Update to Sphinx 7 #99381

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bedc38d
Update to Sphinx 5.3.0
AA-Turner Nov 11, 2022
4c2b811
Update to Sphinx 6.1.3
AA-Turner Apr 20, 2023
7816c8d
Temporary: Use git p-d-t
AA-Turner Apr 20, 2023
697280b
Synchronise
AA-Turner Apr 20, 2023
53ec41d
Fix URL
AA-Turner Apr 20, 2023
4ce7a41
Update to p-d-t PR 127
AA-Turner Apr 20, 2023
2486677
Fix p-d-t PR 127 git install
AA-Turner Apr 20, 2023
b17d4d3
Merge branch 'main' into sphinx-5
CAM-Gerlach Apr 26, 2023
d35d2a2
Update import for Sphinx 6.1
AA-Turner May 4, 2023
993d056
Merge branch 'main' into sphinx-5
AA-Turner May 4, 2023
1ef1c61
Bump to Sphinx 7
AA-Turner May 4, 2023
eeaf03a
Revert "Temporary: Use git p-d-t"
AA-Turner May 12, 2023
6bfc9b9
Merge branch 'main' into sphinx-5
AA-Turner Aug 6, 2023
ff16c8a
Bump to Sphinx 7.1
AA-Turner Aug 6, 2023
8e928c2
Merge branch 'main' into sphinx-5
AA-Turner Aug 8, 2023
a227b46
Restore accidentally removed imports
AA-Turner Aug 8, 2023
e793f43
Bump to Sphinx 7.2
hugovk Dec 21, 2023
8ff38d1
Merge branch 'main' into sphinx-5
hugovk Jan 2, 2024
ad9b77e
Merge branch 'main' into sphinx-5
AA-Turner Jan 19, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into sphinx-5 
# Conflicts:
#	Doc/requirements.txt
#	Doc/tools/extensions/pyspecific.py
  • Loading branch information
@AA-Turner
AA-Turner committed Aug 6, 2023
commit 6bfc9b951eb03ee984647488b6158b0987397195
9 changes: 1 addition & 8 deletions Doc/tools/extensions/pyspecific.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
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
Comment thread
AA-Turner marked this conversation as resolved.
from sphinx.locale import _ as sphinx_gettext
from sphinx.util import logging
Expand All @@ -33,13 +32,7 @@
# Sphinx 6+
from sphinx.util.display import status_iterator
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
# Deprecated in Sphinx 6.1, will be removed in Sphinx 8
from sphinx.util import status_iterator


Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.