Update docker base image to ubuntu-20.04

Update docker files to use ubuntu-20.04. Update ditaa and conf.py
hieroglyph checks to python3 since python2 is no longer supported.

Signed-off-by: Octavian Purdila <tavi@cs.pub.ro>

Author: tavip

.github/workflows/main.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build_job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     name: Build documentation
     steps:
       - name: Checkout

Documentation/conf.py

@@ -127,9 +127,9 @@
     extensions.append("sphinx.ext.pngmath")
 
 try:
-    hglyph_ver = subprocess.check_output(["hieroglyph", "--version"])
+    hglyph_ver = subprocess.check_output(["hieroglyph", "--version"]).decode('utf-8')
     if LooseVersion(hglyph_ver) > LooseVersion("1.0.0"):
-	    extensions.append('hieroglyph')
+        extensions.append("hieroglyph")
 except:
     None
 

Documentation/sphinx/ditaa.py

@@ -7,6 +7,7 @@
     :copyright: Copyright 2017 by Yongping Guo
     :license: BSD, see LICENSE for details.
 """
+from __future__ import print_function
 
 import re, os
 import codecs
@@ -76,7 +77,7 @@ class Ditaa(directives.images.Image):
 
     def run(self):
         if self.arguments:
-            print self.arguments
+            print(self.arguments)
             document = self.state.document
             if self.content:
                 return [document.reporter.warning(
@@ -119,11 +120,13 @@ def run(self):
 
 def render_ditaa(app, code, options, format, prefix='ditaa'):
     """Render ditaa code into a PNG output file."""
-    hashkey = code.encode('utf-8') + str(options) + \
+    # ditaa expects UTF-8 by default
+    code = code.encode('utf-8')
+    hashkey = str(code) + str(options) + \
               str(app.builder.config.ditaa) + \
               str(app.builder.config.ditaa_args)
-    infname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), "ditaa")
-    outfname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), "png")
+    infname = '%s-%s.%s' % (prefix, sha(hashkey.encode('utf-8')).hexdigest(), "ditaa")
+    outfname = '%s-%s.%s' % (prefix, sha(hashkey.encode('utf-8')).hexdigest(), "png")
 
     rel_imgpath = (format == "html") and relative_uri(app.builder.env.docname, app.builder.imagedir) or ''
     infullfn = path.join(app.builder.outdir, app.builder.imagedir, infname)
@@ -135,25 +138,23 @@ def render_ditaa(app, code, options, format, prefix='ditaa'):
         return outrelfn, outfullfn
 
     ensuredir(path.dirname(outfullfn))
-    # ditaa expects UTF-8 by default
-    if isinstance(code, unicode): code = code.encode('utf-8')
 
     ditaa_args = [app.builder.config.ditaa]
     ditaa_args.extend(app.builder.config.ditaa_args)
     ditaa_args.extend(options)
     ditaa_args.extend( [infname, outfname] ) # use relative path
-    f = open(infullfn, 'w')
-    f.write(code.encode('utf-8'))
-    f.close() 
+    f = open(infullfn, 'wb')
+    f.write(code)
+    f.close()
     currpath = os.getcwd()
     os.chdir(path.join(app.builder.outdir, app.builder.imagedir))
 
     try:
         if app.builder.config.ditaa_log_enable:
-            print "rending %s" %(outfullfn)
+            print("rending %s" %(outfullfn))
         #app.builder.warn(ditaa_args)
         p = Popen(ditaa_args, stdout=PIPE, stdin=PIPE, stderr=PIPE)
-    except OSError, err:
+    except OSError as err:
         if err.errno != ENOENT:   # No such file or directory
             raise
         app.builder.warn('ditaa command %r cannot be run (needed for ditaa '
@@ -169,11 +170,11 @@ def render_ditaa(app, code, options, format, prefix='ditaa'):
         # Ditaa may close standard input when an error occurs,
         # resulting in a broken pipe on communicate()
         stdout, stderr = p.communicate(code)
-    except OSError, err:
+    except OSError as err:
         if err.errno != EPIPE:
             raise
         wentWrong = True
-    except IOError, err:
+    except IOError as err:
         if err.errno != EINVAL:
             raise
         wentWrong = True

tools/labs/docker/docs/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update
@@ -7,8 +7,10 @@ RUN apt-get install -y software-properties-common
 RUN apt-get install -y sudo
 RUN apt-get install -y make
 RUN apt-get install -y git
-RUN apt-get install -y python
-RUN apt-get install -y python-pip
+RUN apt-get install -y python3
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+RUN apt-get install -y python3-pip
+RUN update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
 RUN apt-get install -y ditaa
 RUN apt-get install -y graphviz
 RUN apt-get install -y imagemagick