Revert "Remove deprecated sphinxcontrib-images"

This reverts commit 2097ee7.

Upgrade tracked in #198

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"
 

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
 

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
 #