2025-02-05 12:37:56 +00:00
committed by Git OBS Bridge
parent 24c111965b
commit 4fcdd05e86

View File

@@ -1,16 +1,26 @@
---
Doc/conf.py | 14 +++++++-
Doc/conf.py | 17 ++++++++--
Doc/tools/check-warnings.py | 3 +
Doc/tools/extensions/audit_events.py | 54 ++++++++++++++++----------------
Doc/tools/extensions/availability.py | 15 ++++----
Doc/tools/extensions/c_annotations.py | 42 ++++++++++++++----------
Doc/tools/extensions/glossary_search.py | 10 +----
Doc/tools/extensions/patchlevel.py | 9 ++---
7 files changed, 82 insertions(+), 65 deletions(-)
7 files changed, 85 insertions(+), 65 deletions(-)
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -82,7 +82,7 @@ highlight_language = 'python3'
@@ -17,6 +17,9 @@ sys.path.append(os.path.abspath('include
# Python specific content from Doc/Tools/extensions/pyspecific.py
from pyspecific import SOURCE_URI
+# Needed for fixing extlinks modification
+from sphinx import version_info as sphinx_version
+
# General configuration
# ---------------------
@@ -82,7 +85,7 @@ highlight_language = 'python3'
# Minimum version of sphinx required
# Keep this version in sync with ``Doc/requirements.txt``.
@@ -19,7 +29,7 @@
# Create table of contents entries for domain objects (e.g. functions, classes,
# attributes, etc.). Default is True.
@@ -337,7 +337,7 @@ html_short_title = f'{release} Documenta
@@ -337,7 +340,7 @@ html_short_title = f'{release} Documenta
# (See .readthedocs.yml and https://docs.readthedocs.io/en/stable/reference/environment-variables.html)
is_deployment_preview = os.getenv("READTHEDOCS_VERSION_TYPE") == "external"
repository_url = os.getenv("READTHEDOCS_GIT_CLONE_URL", "")
@@ -28,11 +38,11 @@
html_context = {
"is_deployment_preview": is_deployment_preview,
"repository_url": repository_url or None,
@@ -583,6 +583,16 @@ extlinks = {
@@ -583,6 +586,16 @@ extlinks = {
}
extlinks_detect_hardcoded_links = True
+if sphinx.version_info[:2] < (8, 1):
+if sphinx_version[:2] < (8, 1):
+ # Sphinx 8.1 has in-built CVE and CWE roles.
+ extlinks.update({
+ "cve": (