Merge branch '3.14' into backport-001461a-3.14

Author: erlend-aasland

Doc/conf.py

@@ -566,14 +566,11 @@
     'image': '_static/og-image.png',
     'line_color': '#3776ab',
 }
-if 'builder_html' in tags:  # noqa: F821
-    ogp_custom_meta_tags = [
-        '<meta name="theme-color" content="#3776ab">',
-    ]
-    if 'create-social-cards' not in tags:  # noqa: F821
-        # Define a static preview image when not creating social cards
-        ogp_image = '_static/og-image.png'
-        ogp_custom_meta_tags += [
-            '<meta property="og:image:width" content="200">',
-            '<meta property="og:image:height" content="200">',
-        ]
+ogp_custom_meta_tags = ('<meta name="theme-color" content="#3776ab">',)
+if 'create-social-cards' not in tags:  # noqa: F821
+    # Define a static preview image when not creating social cards
+    ogp_image = '_static/og-image.png'
+    ogp_custom_meta_tags += (
+        '<meta property="og:image:width" content="200">',
+        '<meta property="og:image:height" content="200">',
+    )

Doc/requirements.txt

@@ -11,7 +11,7 @@ sphinx~=8.2.0
 
 blurb
 
-sphinxext-opengraph~=0.11.0
+sphinxext-opengraph~=0.12.0
 sphinx-notfound-page~=1.0.0
 
 # The theme used by the documentation is stored separately, so we need

Lib/test/support/__init__.py

@@ -544,7 +544,12 @@ def has_no_debug_ranges():
     return not bool(config['code_debug_ranges'])
 
 def requires_debug_ranges(reason='requires co_positions / debug_ranges'):
-    return unittest.skipIf(has_no_debug_ranges(), reason)
+    try:
+        skip = has_no_debug_ranges()
+    except unittest.SkipTest as e:
+        skip = True
+        reason = e.args[0] if e.args else reason
+    return unittest.skipIf(skip, reason)
 
 
 MS_WINDOWS = (sys.platform == 'win32')