update doc building Docker container to Python3 for Sphinx 2.0 support (

#1473) update doc building Docker container to Python3 for Sphinx 2.0 support
OSGeo · May 16, 2019 · c0b6b6c · c0b6b6c
2 parents d8ea4ea + 20ff08a
commit c0b6b6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/docbuild/Dockerfile b/docs/docbuild/Dockerfile
@@ -1,12 +1,12 @@
 FROM ubuntu:18.04
 
 RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    python-dev python-pip g++ doxygen dvipng latexmk \
+    python3-dev python3-pip g++ doxygen dvipng latexmk \
     cmake libjpeg8-dev zlib1g-dev texlive-latex-base \
     texlive-latex-extra git \
-    graphviz python-matplotlib
+    graphviz python3-matplotlib
 
-RUN pip install Sphinx breathe \
+RUN pip3 install Sphinx breathe \
     sphinx_bootstrap_theme awscli sphinxcontrib-bibtex \
     sphinx_rtd_theme recommonmark sphinx-markdown-tables
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -243,7 +243,7 @@
 
 # Additional stuff for the LaTeX preamble.
 'preamble': preamble,
-'inputenc':'\usepackage[utf8]{inputenc}'
+'inputenc':'\\usepackage[utf8]{inputenc}'
 
 # Latex figure (float) alignment
 #'figure_align': 'htbp',