diff --git a/requirements-dev.txt b/requirements-dev.txt index 16b2521ea..62f55cebf 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,9 +14,12 @@ sphinx-tabs==3.4.5 sphinxcontrib-programoutput==0.17 sphinx-autobuild==2021.3.14 sphinx-notfound-page==1.0.0 -myst-parser==2.0.0 -linuxdoc==20231020 +myst-parser==3.0.1 +linuxdoc==20240509 aiounittest==1.4.2 yamllint==1.35.1 wlc==1.14 coloredlogs==15.0.1 +docutils<=0.21; python_version == '3.8' +docutils>=0.21.2; python_version > '3.8' + diff --git a/utils/lib_sxng_test.sh b/utils/lib_sxng_test.sh index e0a4fe6f0..5e4c94f36 100755 --- a/utils/lib_sxng_test.sh +++ b/utils/lib_sxng_test.sh @@ -89,10 +89,17 @@ test.robot() { dump_return $? } + test.rst() { build_msg TEST "[reST markup] ${RST_FILES[*]}" + + local rst2html=rst2html + if [ "3.8" == "$(python -c 'import sys; print(".".join([str(x) for x in sys.version_info[:2]]))')" ]; then + rst2html=rst2html.py + fi + for rst in "${RST_FILES[@]}"; do - pyenv.cmd rst2html.py --halt error "$rst" > /dev/null || die 42 "fix issue in $rst" + pyenv.cmd "${rst2html}" --halt error "$rst" > /dev/null || die 42 "fix issue in $rst" done }