Skip to content

Commit

Permalink
Build is broken, update everything
Browse files Browse the repository at this point in the history
Immediate problem appears to be `funcparserlib`.
See vlasovskikh/funcparserlib#70.

Found mr2r (mr2 is out of date) and can now use sphinx 4.
  • Loading branch information
mikee47 committed Oct 16, 2021
1 parent e66e4f3 commit cb34b32
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
6 changes: 4 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ version: 2
# Optionally build your docs in additional formats such as PDF and ePub
formats:
- htmlzip
# - pdf

sphinx:
configuration: docs/source/conf.py

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
version: 3.8
install:
- requirements: docs/requirements.txt

Expand Down
13 changes: 7 additions & 6 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Requirements file for pip
# list of Python packages used in documentation build
sphinx==2.4.4
sphinx==4.2.0
sphinx-rtd-theme
m2r
breathe==4.13.0
m2r2
breathe==4.31.0
sphinxcontrib-wavedrom
sphinx-copybutton
sphinxcontrib-seqdiag>=0.8.5
jinja2>=2.11.3
setuptools==57.5.0
sphinxcontrib-seqdiag==2.0.0
jinja2==2.11.3
setuptools>=57.5.0
funcparserlib==1.0.0a0
9 changes: 5 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# so developers can more easily locate the appropriate reference documentation.
#
extensions = [
'm2r',
'm2r2',
'breathe',
'sphinxcontrib.seqdiag',
'link-roles',
Expand Down Expand Up @@ -101,6 +101,10 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

html_css_files = [
'custom.css',
]

html_extra_path = [
'../api/html'
]
Expand Down Expand Up @@ -134,6 +138,3 @@

subprocess.call('make -C ../../Sming submodules SMING_ARCH=Host', shell=True)
subprocess.call('make -C .. setup api API_VERSION="' + version + '"', shell=True)

def setup(app):
app.add_stylesheet('custom.css')

0 comments on commit cb34b32

Please sign in to comment.