]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-40204: Allow pre-Sphinx 3 syntax in the doc (GH-21844)
authorVictor Stinner <vstinner@python.org>
Wed, 12 Aug 2020 19:49:22 +0000 (21:49 +0200)
committerGitHub <noreply@github.com>
Wed, 12 Aug 2020 19:49:22 +0000 (21:49 +0200)
Enable Sphinx 3.2 "c_allow_pre_v3" option and disable the
c_warn_on_allowed_pre_v3 option to make the documentation compatible
with Sphinx 2 and Sphinx 3.

Doc/conf.py
Misc/NEWS.d/next/Documentation/2020-08-12-18-35-40.bpo-40204.C8A_pe.rst [new file with mode: 0644]

index bfb2a98fc63a2f153bc7c9341c774ac8fc33c8e4..079d17717f381c66f72f5f13bfcd0fdf7d6beadb 100644 (file)
@@ -228,3 +228,13 @@ linkcheck_ignore = [r'https://bugs.python.org/(issue)?\d+',
 
 # Relative filename of the reference count data file.
 refcount_file = 'data/refcounts.dat'
+
+# Sphinx 2 and Sphinx 3 compatibility
+# -----------------------------------
+
+# bpo-40204: Allow Sphinx 2 syntax in the C domain
+c_allow_pre_v3 = True
+
+# bpo-40204: Disable warnings on Sphinx 2 syntax of the C domain since the
+# documentation is built with -W (warnings treated as errors).
+c_warn_on_allowed_pre_v3 = False
diff --git a/Misc/NEWS.d/next/Documentation/2020-08-12-18-35-40.bpo-40204.C8A_pe.rst b/Misc/NEWS.d/next/Documentation/2020-08-12-18-35-40.bpo-40204.C8A_pe.rst
new file mode 100644 (file)
index 0000000..152f6c9
--- /dev/null
@@ -0,0 +1,3 @@
+Enable Sphinx 3.2 ``c_allow_pre_v3`` option and disable
+``c_warn_on_allowed_pre_v3`` option to make the documentation compatible
+with Sphinx 2 and Sphinx 3.