From 9cac21f2d93122b98f92583708e17493bed6d3bc Mon Sep 17 00:00:00 2001
From: Howard Butler <howard@hobu.co>
Date: Wed, 15 May 2019 15:56:50 -0500
Subject: update doc building Docker container to Python3 for Sphinx 2.0
 support

---
 docs/docbuild/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs')

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
 
-- 
cgit v1.2.3


From 20ff08a11a82798d149596eaa0898fe7743c5cd2 Mon Sep 17 00:00:00 2001
From: Howard Butler <howard@hobu.co>
Date: Wed, 15 May 2019 16:06:22 -0500
Subject: \u is a python3 thing

---
 docs/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

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',
-- 
cgit v1.2.3