Skip to content

Commit 45e8a76

Browse files
committed
docs: Upgraded Sphinx, Breathe and Blockdiag to the latest versions following ESP-IDF
1 parent 428310f commit 45e8a76

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

docs/check_doc_warnings.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ fi
1818
# the Sphinx warning log
1919
# (escape char removal from https://www.commandlinefu.com/commands/view/6141/remove-color-codes-special-characters-with-sed
2020
sed -r 's:\x1B\[[0-9;]*[mK]::g' sphinx-warning-log.txt | \
21-
sed -E "s~${IDF_PATH}~\${IDF_PATH}~" | \
22-
sed -E "s/:[0-9]+:/:line:/" > sphinx-warning-log-sanitized.txt
21+
sed -E "s/.*\/(.*):[0-9]+:/\1:line:/" > sphinx-warning-log-sanitized.txt
2322

2423
# diff sanitized warnings, ignoring lines which only appear in ../sphinx-known-warnings.txt
2524

docs/requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This is a list of python packages used to generate documentation. This file is used with pip:
2-
# pip install -r requirements.txt
2+
# pip install --user -r requirements.txt
33
#
4-
sphinx==1.6.5
4+
sphinx>=1.6.5
55
sphinx-rtd-theme
6-
breathe==4.7.3
7-
sphinxcontrib.blockdiag==1.5.3
8-
sphinxcontrib.seqdiag==0.8.5
9-
sphinxcontrib.actdiag==0.8.5
10-
sphinxcontrib.nwdiag==0.9.5
11-
recommonmark
6+
breathe>=4.7.3
7+
sphinxcontrib-blockdiag>=1.5.3
8+
sphinxcontrib-seqdiag>=0.8.5
9+
sphinxcontrib-actdiag>=0.8.5
10+
sphinxcontrib-nwdiag>=0.9.5
11+
recommonmark

docs/sphinx-known-warnings.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@
88
#
99

1010
#
11-
# Sphinx known issue https://github.com/sphinx-doc/sphinx/issues/2683\
11+
# Breathe known issue: https://github.com/michaeljones/breathe/issues/405
12+
# Sphinx known issue: https://github.com/sphinx-doc/sphinx/pull/5901
1213
#
14+
audio_def.inc:line: WARNING: Duplicate declaration, audio_err_t
15+
audio_def.inc:line: WARNING: Duplicate declaration, esp_audio_status_t
16+
esp_audio.inc:line: WARNING: Duplicate declaration, struct esp_audio_cfg_t esp_audio_cfg_t
17+
esp_audio.inc:line: WARNING: Duplicate declaration, struct esp_audio_setup_t esp_audio_setup_t

0 commit comments

Comments
 (0)