Merge pull request #77 from pllim/fix-sphinxdev-ci

Fix sphinxdev ci
astropy · Feb 3, 2025 · f593235 · f593235
2 parents 41b35e6 + da8398d
commit f593235
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/sphinx_astropy/conf/v1.py b/sphinx_astropy/conf/v1.py
@@ -15,6 +15,8 @@
 from os import path
 
 import astropy_sphinx_theme
+import sphinx
+from packaging.version import Version
 
 try:
     import astropy
@@ -33,7 +35,7 @@
 # specific version check, call check_sphinx_version("x.y.z.") from
 # your project's conf.py
 needs_sphinx = '3.0'
-
+SPHINX_LT_8_2 = Version(sphinx.__version__) < Version("8.2.dev")
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
@@ -238,14 +240,17 @@ def check_sphinx_version(expected_version):
 # Render inheritance diagrams in SVG
 graphviz_output_format = "svg"
 
-graphviz_dot_args = [
+graphviz_dot_args = (
     '-Nfontsize=10',
     '-Nfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Efontsize=10',
     '-Efontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Gfontsize=10',
     '-Gfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
-]
+)
+
+if SPHINX_LT_8_2:
+    graphviz_dot_args = list(graphviz_dot_args)
 
 # -- Options for HTML output -------------------------------------------------
 

diff --git a/sphinx_astropy/conf/v2.py b/sphinx_astropy/conf/v2.py
@@ -13,6 +13,9 @@
 from collections import ChainMap
 from os import path
 
+import sphinx
+from packaging.version import Version
+
 try:
     import astropy
 except ImportError:
@@ -28,6 +31,7 @@
 # The version check in Sphinx itself can only compare the major and
 # minor parts of the version number, not the micro.
 needs_sphinx = '4.2'
+SPHINX_LT_8_2 = Version(sphinx.__version__) < Version("8.2.dev")
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
@@ -228,14 +232,17 @@
 # Render inheritance diagrams in SVG
 graphviz_output_format = "svg"
 
-graphviz_dot_args = [
+graphviz_dot_args = (
     '-Nfontsize=10',
     '-Nfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Efontsize=10',
     '-Efontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Gfontsize=10',
     '-Gfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
-]
+)
+
+if SPHINX_LT_8_2:
+    graphviz_dot_args = list(graphviz_dot_args)
 
 # For sphinx-copybutton
 copybutton_prompt_text = r">>> |\.\.\. |\$ |In \[\d*\]: | {2,5}\.\.\.: | {5,8}: "