Update API site build (#9622)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9781f9f853fb725a24b14a64daed5bfb3720336b..a3d634261140f93cd313999cc27f3196beb162c6 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,9 +300,8 @@ package:docker:
 
 pages:
   stage: deploy
-  image: python:3.7
+  image: python:3.8
   before_script:
-    - pip install pip==18.1
     - pip install git+https://github.com/Python-Markdown/markdown.git
     - pip install git+https://github.com/mkdocs/mkdocs.git
     - pip install pygments

diff --git a/doc/mkdocs/lua_highlight.patch b/doc/mkdocs/lua_highlight.patch
index 034a63a331d2a141f06464b689f28e8a1f636c3f..e231081d60552cb516241181b875b7ba548bca37 100644 (file)
--- a/doc/mkdocs/lua_highlight.patch
+++ b/doc/mkdocs/lua_highlight.patch
@@ -1,4 +1,4 @@
-@@ -77,7 +77,7 @@
+@@ -75,7 +75,7 @@
                   css_class="codehilite", lang=None, style='default',
                   noclasses=False, tab_length=4, hl_lines=None, use_pygments=True):
          self.src = src
@@ -7,13 +7,3 @@
          self.linenums = linenums
          self.guess_lang = guess_lang
          self.css_class = css_class
-@@ -119,7 +119,8 @@
-                                               cssclass=self.css_class,
-                                               style=self.style,
-                                               noclasses=self.noclasses,
--                                              hl_lines=self.hl_lines)
-+                                              hl_lines=self.hl_lines,
-+                                              wrapcode=True)
-             return highlight(self.src, lexer, formatter)
-         else:
-             # just escape and build markup usable by JS highlighting libs