Add back fit px

sunpy · Aug 8, 2024 · 661f90c · 661f90c
1 parent a490a5b
commit 661f90c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
         - pandoc
         - graphviz
       envs: |
-        - linux: py312-sphinx78
+        - linux: py312-sphinx8
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -59,7 +59,7 @@ jobs:
       envs: |
         - macos: py311-sphinx7
         - windows: py310-sphinx7
-        - linux: py310-sphinx6
+        - linux: py39-sphinx6
         - linux: py312-devdeps
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

diff --git a/src/ablog/__init__.py b/src/ablog/__init__.py
@@ -8,6 +8,7 @@
 from pathlib import PurePath
 
 from sphinx.builders.html import StandaloneHTMLBuilder
+from sphinx.errors import ThemeError
 from sphinx.jinja2glue import BuiltinTemplateLoader, SphinxFileSystemLoader
 from sphinx.locale import get_translation
 
@@ -126,7 +127,13 @@ def builder_inited(app):
     theme = app.builder.theme
     loaders = app.builder.templates.loaders
     templatepathlen = app.builder.templates.templatepathlen
-    if theme.get_config("ablog", "inject_templates_after_theme", False):
+    try:
+        # Modern Sphinx now errors instead of returning the default if there is not a value
+        # in any of the config files.
+        after_theme = theme.get_config("ablog", "inject_templates_after_theme", False)
+    except ThemeError:
+        after_theme = False
+    if after_theme:
         # Inject *after* the user templates and the theme templates,
         # allowing themes to override the templates provided by this
         # extension while those templates still serve as a fallback.