Merge pull request #286 from python-adaptive/use-m2r2

basnijholt · web-flow · commit 72e9ec882868 · 2020-08-07T13:35:19.000+02:00
Use m2r2
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -15,7 +15,7 @@ dependencies:
   - jupyter_sphinx
   - atomicwrites
   - sphinx_fontawesome
-  - sphinx=2.4.4  # because https://github.com/miyakogi/m2r/pull/55
-  - m2r
+  - sphinx
+  - m2r2
   - pip:
     - sphinx_rtd_theme
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -53,7 +53,7 @@
     "sphinx.ext.napoleon",
     "jupyter_sphinx.execute",
     "sphinx_fontawesome",
-    "m2r",
+    "m2r2",
 ]
 
 source_parsers = {}
