diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-05-20 11:09:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 11:09:07 +0200 |
| commit | 573e57a8b323d9e5455ed30a4bf11b4cb265f59d (patch) | |
| tree | 194110f75ed51a5dff0a0bef84cfc3bc47e26d14 | |
| parent | 4212384c50f85aba6a3ae70d649047576fc1e0cc (diff) | |
| parent | 602c629481ee43fed1d8856c37048bd63b59744e (diff) | |
| download | PROJ-573e57a8b323d9e5455ed30a4bf11b4cb265f59d.tar.gz PROJ-573e57a8b323d9e5455ed30a4bf11b4cb265f59d.zip | |
[Backport 6.1] update doc building Docker container to Python3 for Sphinx 2.0 support (#1476)
[Backport 6.1] update doc building Docker container to Python3 for Sphinx 2.0 support
| -rw-r--r-- | docs/docbuild/Dockerfile | 6 | ||||
| -rw-r--r-- | docs/source/conf.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/docbuild/Dockerfile b/docs/docbuild/Dockerfile index 40a3dbc5..5aca89e9 100644 --- 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 index 0abc17ff..fc8438fd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -243,7 +243,7 @@ latex_elements = { # Additional stuff for the LaTeX preamble. 'preamble': preamble, -'inputenc':'\usepackage[utf8]{inputenc}' +'inputenc':'\\usepackage[utf8]{inputenc}' # Latex figure (float) alignment #'figure_align': 'htbp', |