update docs-build dependencies (#3335)

* update docs-build dependencies * add space * revert matplotlib version
isl-org · Apr 24, 2021 · 6749ab1 · 6749ab1
1 parent 60d020a
commit 6749ab1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/docs/builddocs.rst b/docs/builddocs.rst
@@ -41,10 +41,10 @@ First, install a TeX distribution such as `MacTeX <http://www.tug.org/mactex/>`_
 .. code-block:: bash
 
     # Install deps
-    pip install -U "sphinx==3.1.2" "sphinx-rtd-theme==0.5.0" "nbsphinx==0.7.1" "Pillow==7.2.0"
+    pip install -U sphinx==3.5.4 sphinx-rtd-theme==0.5.1 nbsphinx==0.8.3 matplotlib==3.3.3
 
-    # Patched m2r: https://github.com/sphinx-doc/sphinx/issues/7420
-    pip install -U -q git+https://github.com/intel-isl/m2r@dev#egg=m2r
+    # Patched m2r: https://github.com/sphinx-doc/sphinx/issues/7420#issuecomment-657160798
+    pip install -U m2r2==0.2.7
 
 
 Build

diff --git a/docs/conf.py b/docs/conf.py
@@ -62,7 +62,7 @@ def get_git_short_hash():
     "sphinx.ext.autosummary",
     "sphinx.ext.napoleon",
     "nbsphinx",
-    'm2r',
+    'm2r2',
 ]
 
 if os.environ["skip_notebooks"] == "true":

diff --git a/docs/cpp_project.rst b/docs/cpp_project.rst
@@ -6,10 +6,10 @@ Build your C++ projects with Open3D
 We provide two example CMake projects to demonstrate how to use Open3D in your
 CMake projects.
 
-* `Find Pre-Installed Open3D Package in CMake<https://github.com/intel-isl/open3d-cmake-find-package>`_
+* `Find Pre-Installed Open3D Package in CMake <https://github.com/intel-isl/open3d-cmake-find-package>`_
   This option can be used if you'd like Open3D build and install Open3D first,
   then link your project to Open3D.
-* `Use Open3D as a CMake External Project<https://github.com/intel-isl/open3d-cmake-external-project>`_
+* `Use Open3D as a CMake External Project <https://github.com/intel-isl/open3d-cmake-external-project>`_
   This option can be used if you'd like Open3D to build alongside with your
   project.
 

diff --git a/util/ci_utils.sh b/util/ci_utils.sh
@@ -41,10 +41,11 @@ SCIPY_VER="1.5.4"
 YAPF_VER="0.30.0"
 
 # Documentation
-SPHINX_VER=3.1.2
-SPHINX_RTD_VER=0.5.0
-NBSPHINX_VER=0.7.1
+SPHINX_VER=3.5.4
+SPHINX_RTD_VER=0.5.1
+NBSPHINX_VER=0.8.3
 MATPLOTLIB_VER=3.3.3
+M2R2_VER=0.2.7
 
 OPEN3D_INSTALL_DIR=~/open3d_install
 OPEN3D_SOURCE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null 2>&1 && pwd)"
@@ -435,10 +436,8 @@ install_docs_dependencies() {
         "matplotlib==$MATPLOTLIB_VER" \
         "sphinx==$SPHINX_VER" \
         "sphinx-rtd-theme==$SPHINX_RTD_VER" \
-        "nbsphinx==$NBSPHINX_VER"
-    # m2r needs a patch for sphinx 3
-    # https://github.com/sphinx-doc/sphinx/issues/7420
-    python -m pip install -U -q "git+https://github.com/intel-isl/m2r@dev#egg=m2r"
+        "nbsphinx==$NBSPHINX_VER" \
+        "m2r2==$M2R2_VER"
     python -m pip install -U -q "yapf==$YAPF_VER"
     echo
     if [[ -d "$1" ]]; then