Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sphinx-mermaid extension and update userdoc workflow #2603

Merged
merged 34 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0bd1e5d
Create kernel.rst
terhorstd Jan 31, 2023
2d64493
add sequence diagram example
terhorstd Jan 31, 2023
fe20bf7
add req mermaid
jessica-mitchell Feb 3, 2023
12e0584
change format to memaid sphinx
jessica-mitchell Feb 3, 2023
d872921
fix build fail sphinx_gallery needs txt
jessica-mitchell Feb 3, 2023
402f796
add mermaid js to source
jessica-mitchell Feb 3, 2023
f3c18ba
fix new lines, remove sample
jessica-mitchell Feb 3, 2023
9d83f56
pep8
jessica-mitchell Feb 6, 2023
2f9fa72
Merge branch 'master' into add-sphinx-mermaid
jessica-mitchell May 4, 2023
f569a57
try specify version
jessica-mitchell May 5, 2023
83a1c93
change version to 9.4.0
jessica-mitchell May 8, 2023
1c761cb
Merge branch 'master' into add-technical-docs
jessica-mitchell May 8, 2023
3f70bc2
Merge branch 'master' into add-technical-docs
jessica-mitchell May 24, 2023
b8de7af
Merge pull request #2774 from jessica-mitchell/add-technical-docs
jessica-mitchell May 24, 2023
f7454bd
Merge branch 'add-technical-docs' into add-sphinx-mermaid
jessica-mitchell Jun 2, 2023
be4589c
Merge branch 'master' into add-sphinx-mermaid
jessica-mitchell Aug 11, 2023
74a405d
Merge branch 'add-sphinx-mermaid' of github.com:jessica-mitchell/nest…
jessica-mitchell Aug 11, 2023
56219ea
try new version of mermaid
jessica-mitchell Aug 11, 2023
ce3bbf3
try to get to work
jessica-mitchell Aug 11, 2023
f14225a
rm js
jessica-mitchell Aug 14, 2023
09ea933
rm require.js from nbsphinx config so mermaid works
jessica-mitchell Aug 15, 2023
9b5c34d
modify graph and update css
jessica-mitchell Aug 15, 2023
613ff3c
Merge branch 'master' into add-sphinx-mermaid
jessica-mitchell Aug 15, 2023
2792c0d
black fix
jessica-mitchell Aug 15, 2023
e4f07b4
black fix
jessica-mitchell Aug 15, 2023
b9a9576
add styling to flowchart
jessica-mitchell Aug 15, 2023
61fb6a0
test different colours
jessica-mitchell Aug 21, 2023
ccde3db
Merge branch 'master' into add-sphinx-mermaid
jessica-mitchell Aug 29, 2023
da83b4d
readd removal of js
jessica-mitchell Aug 29, 2023
4b76446
simplify diagram, add styling
jessica-mitchell Aug 29, 2023
10bc68f
fix admon tip
jessica-mitchell Aug 30, 2023
c001496
rework text
jessica-mitchell Aug 30, 2023
6b483a4
add checkout branch line
jessica-mitchell Sep 1, 2023
224ba79
change number to bullet
jessica-mitchell Sep 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/htmldoc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
'sphinx.ext.intersphinx',
'sphinx.ext.mathjax',
'nbsphinx',
'sphinxcontrib.mermaid',
'sphinx_design',
'HoverXTooltip',
'VersionSyncRole',
Expand All @@ -103,6 +104,8 @@
mathjax_path = "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"
# "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
# "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" # noqa
mermaid_output_format = "raw"
mermaid_version = ""

panels_add_bootstrap_css = False
# Add any paths that contain templates here, relative to this directory.
Expand Down Expand Up @@ -253,6 +256,7 @@ def setup(app):
app.add_css_file('css/custom.css')
app.add_css_file('css/pygments.css')
app.add_js_file("js/custom.js")
app.add_js_file("js/mermaid.js")
jessica-mitchell marked this conversation as resolved.
Show resolved Hide resolved

# for events see
# https://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx-core-events
Expand Down
18 changes: 18 additions & 0 deletions doc/htmldoc/developer_space/architecture/kernel.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Kernel
======

.. mermaid::

sequenceDiagram
user -> simulation_manager: prepare()
simulation_manager -> node_manager: prepare_nodes()
node_manager -> node: init()
node_manager -> node: pre_run_hook()
Note left of node_manager: state:<br/>prepared
user -> simulation_manager: run()
Note right of simulation_manager: 1
user -> simulation_manager: run()
Note left of user: store results<br/>...
user -> simulation_manager: cleanup()


1,285 changes: 1,285 additions & 0 deletions doc/htmldoc/static/js/mermaid.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ scipy
seaborn
sphinx>=4.0.2
sphinx_autobuild
sphinxcontrib-mermaid
sphinx-design
sphinx_gallery
sphinx-material
Expand Down
File renamed without changes.