Skip to content

Commit

Permalink
DM-46777: Add a lower bound on sphinxcontrib-mermaid, revert sphinx pin
Browse files Browse the repository at this point in the history
* Set a lower bound on sphinxcontrib-mermaid to <=1
* Revert the Sphinx pin because this fixes the compatibility issue
* Ditch the `mermaid_version` pin because this fixes
mgaitan/sphinxcontrib-mermaid#110
  • Loading branch information
fajpunk committed Oct 15, 2024
1 parent 62db5bc commit d5551bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion changelog.d/20241010_133336_danfuchs_mermaid_compat.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### Bug fixes

- Pin `sphinx` to < 8.1.0. [Sphinx 8.1.0](https://github.com/sphinx-doc/sphinx/compare/v8.0.2...v8.1.0) contains [a commit](https://github.com/sphinx-doc/sphinx/pull/12762/files#diff-a4c6bf1492ef480b94af82c988f64ca56fa256fab0ed043a5ad3d4043f89a645L14) that removes the `ExtensionError` export from the `sphinx.util` package. This currently breaks the [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid) dependency.
- Bump `sphinxcontrib-mermaid` to >= 1, which fixes an incompatibility with sphinx==1.8.1, and allows us to unpin the version of mermaid JS.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requires-python = ">=3.11"
dynamic = ["version"]
dependencies = [
"docutils>=0.20", # solves an extra div bug with the bibliography directive
"Sphinx>=7,<8.1.0", # Consistent docutils constraint, mermaid compatibility
"Sphinx>=7", # Consistent docutils constraint
"PyYAML",
"GitPython",
"requests",
Expand Down Expand Up @@ -74,7 +74,7 @@ guide = [
"myst-parser",
"myst-nb",
"markdown-it-py[linkify]",
"sphinxcontrib-mermaid",
"sphinxcontrib-mermaid>=1",
"sphinxext-opengraph",
"sphinxcontrib-redoc",
"sphinxcontrib-jquery",
Expand Down
5 changes: 0 additions & 5 deletions src/documenteer/conf/guide.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
"myst_enable_extensions",
# MERMAID
"mermaid_output_format",
"mermaid_version",
# OPENGRAPH
"ogp_site_url",
"ogp_site_name",
Expand Down Expand Up @@ -439,10 +438,6 @@
# Mermaid CLI installation
mermaid_output_format = "raw"

# Temporary workaround for not getting mermaid 10 successfully from unpkg
# https://github.com/mgaitan/sphinxcontrib-mermaid/issues/110
mermaid_version = "9.4.0"

# ============================================================================
# #OPENGRAPH OpenGraph diagram support
# https://github.com/wpilibsuite/sphinxext-opengraph
Expand Down

0 comments on commit d5551bd

Please sign in to comment.