Skip to content

Commit 082d2b2

Browse files
committed
Merge branch 'master' of github.com:incebellipipo/mclsimpy
2 parents efe380d + c6fac18 commit 082d2b2

File tree

6 files changed

+47
-11
lines changed

6 files changed

+47
-11
lines changed

.readthedocs.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: 2
22

33
build:
4-
os: "ubuntu-20.04"
4+
os: "ubuntu-22.04"
55
tools:
6-
python: "3.8"
6+
python: "3.12"
77

88
python:
99
# Install our python package before building the docs
@@ -12,4 +12,10 @@ python:
1212
path: .
1313

1414
sphinx:
15+
configuration: docs/conf.py
1516
fail_on_warning: true
17+
18+
versions:
19+
only:
20+
- master
21+
- /^v\d+\.\d+/

docs/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# You can set these variables from the command line, and also
55
# from the environment for the first two.
66
SPHINXOPTS ?=
7-
SPHINXBUILD ?= sphinx-build
7+
SPHINXBUILD ?= sphinx-multiversion
8+
# SPHINXBUILD ?= sphinx-build
89
SOURCEDIR = .
910
BUILDDIR = _build
1011

docs/_templates/versions.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{%- if current_version %}
2+
<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
3+
<span class="rst-current-version" data-toggle="rst-current-version">
4+
<span class="fa fa-book"> Other Versions</span>
5+
v: {{ current_version.name }}
6+
<span class="fa fa-caret-down"></span>
7+
</span>
8+
<div class="rst-other-versions">
9+
{%- if versions.tags %}
10+
<dl>
11+
<dt>Tags</dt>
12+
{%- for item in versions.tags %}
13+
<dd><a href="{{ item.url }}">{{ item.name }}</a></dd>
14+
{%- endfor %}
15+
</dl>
16+
{%- endif %}
17+
{%- if versions.branches %}
18+
<dl>
19+
<dt>Branches</dt>
20+
{%- for item in versions.branches %}
21+
<dd><a href="{{ item.url }}">{{ item.name }}</a></dd>
22+
{%- endfor %}
23+
</dl>
24+
{%- endif %}
25+
</div>
26+
</div>
27+
{%- endif %}

docs/conf.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,18 @@
2424
'sphinx.ext.autodoc',
2525
'sphinx.ext.napoleon',
2626
'sphinx.ext.autosummary',
27-
'sphinx_rtd_theme'
27+
'sphinx_rtd_theme',
28+
'sphinx_multiversion'
2829
]
2930

3031
templates_path = ['_templates']
3132
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
32-
33-
33+
html_sidebars = {
34+
'**': [
35+
'versions.html',
36+
],
37+
}
38+
smv_default_ref = 'master'
3439

3540
# -- Options for HTML output -------------------------------------------------
3641
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

docs/index.rst

-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ The package have some of the same features as the `MSS Toolbox <https://se.mathw
4242

4343
getting_started
4444
modules/simulator
45-
modules/control
46-
modules/guidance
47-
modules/thrust_allocation
48-
modules/observer
4945
modules/waves
5046
modules/utils
5147

docs/requirements.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
sphinx==7.1.2
2-
sphinx-rtd-theme==1.3.0rc1
2+
sphinx-rtd-theme==3.0.2
3+
sphinx-multiversion

0 commit comments

Comments
 (0)