Merge PR #11862: Fix deprecation warning in sphinx and remove workaround for fixed bug

Reviewed-by: Zimmi48

5 files changed, 7 insertions, 11 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00ccc9f137..5e6c380f4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ stages:
 variables:
   # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here
   # for reference]
-  CACHEKEY: "bionic_coq-V2019-03-18-V93"
+  CACHEKEY: "bionic_coq-V2020-03-19-V93"
   IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY"
   # By default, jobs run in the base switch; override to select another switch
   OPAM_SWITCH: "base"
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 4e229bb777..e14f634073 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -1,4 +1,4 @@
-# CACHEKEY: "bionic_coq-V2019-03-18-V93"
+# CACHEKEY: "bionic_coq-V2020-03-19-V93"
 # ^^ Update when modifying this file.
 
 FROM ubuntu:bionic
@@ -18,7 +18,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -y -qq \
         texlive-science tipa
 
 # More dependencies of the sphinx doc
-RUN pip3 install sphinx==1.7.8 sphinx_rtd_theme==0.2.5b2 \
+RUN pip3 install sphinx==1.8.0 sphinx_rtd_theme==0.2.5b2 \
                  antlr4-python3-runtime==4.7.1 sphinxcontrib-bibtex==0.4.0
 
 # We need to install OPAM 2.0 manually for now.
diff --git a/doc/README.md b/doc/README.md
index 7fa6f5cf3d..e749bcf5d1 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -30,7 +30,7 @@ To produce the complete documentation in HTML, you will need Coq dependencies
 listed in [`INSTALL.md`](../INSTALL.md). Additionally, the Sphinx-based
 reference manual requires Python 3, and the following Python packages:
 
-  - sphinx >= 1.7.8
+  - sphinx >= 1.8.0
   - sphinx_rtd_theme >= 0.2.5b2
   - beautifulsoup4 >= 4.0.6
   - antlr4-python3-runtime >= 4.7.1
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 98272810f6..3d77d07061 100755
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -46,7 +46,7 @@ with open("refman-preamble.rst") as s:
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.7.8'
+needs_sphinx = '1.8.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
diff --git a/doc/tools/coqrst/coqdomain.py b/doc/tools/coqrst/coqdomain.py
index b92c94fe2c..84f32e187b 100644
--- a/doc/tools/coqrst/coqdomain.py
+++ b/doc/tools/coqrst/coqdomain.py
@@ -34,7 +34,6 @@ from sphinx.util.logging import getLogger, get_node_location
 from sphinx.directives import ObjectDescription
 from sphinx.domains import Domain, ObjType, Index
 from sphinx.domains.std import token_xrefs
-from sphinx.ext import mathbase
 
 from . import coqdoc
 from .repl import ansicolors
@@ -74,8 +73,7 @@ def make_target(objtype, targetid):
     return "coq:{}.{}".format(objtype, targetid)
 
 def make_math_node(latex, docname, nowrap):
-    node = mathbase.displaymath()
-    node['latex'] = latex
+    node = nodes.math_block(latex, latex)
     node['label'] = None # Otherwise equations are numbered
     node['nowrap'] = nowrap
     node['docname'] = docname
@@ -493,9 +491,7 @@ class ProductionObject(CoqObject):
         pass
 
     def _target_id(self, name):
-        # Use `name[1]` instead of ``nodes.make_id(name[1])`` to work around
-        # https://github.com/sphinx-doc/sphinx/issues/4983
-        return 'grammar-token-{}'.format(name[1])
+        return 'grammar-token-{}'.format(nodes.make_id(name[1]))
 
     def _record_name(self, name, targetid):
         env = self.state.document.settings.env