diff options
| author | Emilio Jesus Gallego Arias | 2020-06-05 17:35:37 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2020-06-05 17:35:37 +0200 |
| commit | e36b1c27e6ebd50bfecb524a64bfe61a666557f2 (patch) | |
| tree | e588d9f89216c1e279d8f984f42282ff62ed2065 | |
| parent | 7bfd2bfe28dc8e780a36549ff848ac49cce1082f (diff) | |
| parent | b6c940346123ea9f4e28845436a274c92c9baae6 (diff) | |
Merge PR #12459: Document incompatibility with Sphinx 3.
Reviewed-by: cpitclaudel
| -rw-r--r-- | doc/README.md | 9 | ||||
| -rw-r--r-- | doc/sphinx/changes.rst | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/doc/README.md b/doc/README.md index e3ab5ae4d2..99d285320d 100644 --- a/doc/README.md +++ b/doc/README.md @@ -28,9 +28,10 @@ Dependencies 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: +reference manual requires Python 3, and the following Python packages +(note the version constraints on Sphinx): - - sphinx >= 2.3.1 + - sphinx >= 2.3.1 & < 3.0.0 - sphinx_rtd_theme >= 0.4.3 - beautifulsoup4 >= 4.0.6 - antlr4-python3-runtime >= 4.7.1 @@ -40,8 +41,8 @@ reference manual requires Python 3, and the following Python packages: To install them, you should first install pip and setuptools (for instance, with `apt install python3-pip python3-setuptools` on Debian / Ubuntu) then run: - pip3 install sphinx sphinx_rtd_theme beautifulsoup4 antlr4-python3-runtime \ - pexpect sphinxcontrib-bibtex + pip3 install sphinx==2.3.1 sphinx_rtd_theme beautifulsoup4 \ + antlr4-python3-runtime==4.7.1 pexpect sphinxcontrib-bibtex Nix users should get the correct development environment to build the HTML documentation from Coq's [`default.nix`](../default.nix) (note this diff --git a/doc/sphinx/changes.rst b/doc/sphinx/changes.rst index 72f0fdf4c5..68ab36a5ff 100644 --- a/doc/sphinx/changes.rst +++ b/doc/sphinx/changes.rst @@ -970,8 +970,14 @@ Infrastructure and dependencies - **Changed:** Minimal versions of dependencies for building the reference manual: - now requires Sphinx 2.3.1+, sphinx_rtd_theme 0.4.3+ and - sphinxcontrib-bibtex 0.4.2+ + now requires Sphinx >= 2.3.1 & < 3.0.0, sphinx_rtd_theme 0.4.3+ and + sphinxcontrib-bibtex 0.4.2+. + + .. warning:: + + The reference manual is known not to build properly with + Sphinx 3. + (`#12224 <https://github.com/coq/coq/pull/12224>`_, by Jim Fehrle and Théo Zimmermann). - **Removed:** |