diff --git a/Packages/doc/conf.py b/Packages/doc/conf.py index e6f2e645f5..91b34bdeb8 100644 --- a/Packages/doc/conf.py +++ b/Packages/doc/conf.py @@ -21,7 +21,7 @@ def get_version(): return "({branch}) {version}".format(branch=branchString, version=revString) # sphinx config -extensions = ['sphinx.ext.mathjax', 'sphinx.ext.todo', 'breathe', 'sphinxcontrib.fulltoc'] +extensions = ['sphinx.ext.mathjax', 'sphinx.ext.todo', 'breathe', 'sphinxcontrib.fulltoc', 'sphinxcontrib.images'] master_doc = "index" project= "MIES Igor" diff --git a/tools/build-documentation.sh b/tools/build-documentation.sh index cd725721e2..9c17f76985 100755 --- a/tools/build-documentation.sh +++ b/tools/build-documentation.sh @@ -92,12 +92,12 @@ done if hash sphinx-build 2>/dev/null; then echo "Start sphinx-build" - sphinx_version=$(sphinx-build --version 2>&1 | cut -f 2 -d " " | cut -f 1 -d .) - sphinx_version_required=2 + sphinx_version=$(sphinx-build --version 2>&1 | cut -f 2 -d " ") + sphinx_version_required=1.8.3 - if ! ((sphinx_version >= sphinx_version_required)); then + if [[ "$sphinx_version" != "$sphinx_version_required" ]]; then echo "Errors building the documentation" 1>&2 - echo "sphinx-build version is wrong. we require a sphinx version greater or equal to $sphinx_version_required but got $sphinx_version" 1>&2 + echo "sphinx-build version is wrong, we require exactly $sphinx_version_required but got $sphinx_version" 1>&2 Failed fi diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 62e960ecb8..0ae975ceac 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -21,8 +21,9 @@ RUN DEBIAN_FRONTEND=noninteractive \ RUN DEBIAN_FRONTEND=noninteractive \ pip3 install \ breathe \ - sphinx \ - sphinxcontrib-fulltoc + 'sphinx<2,>=1.1.3' \ + sphinxcontrib-fulltoc \ + sphinxcontrib-images # [optional] IPNWB submodule script #