Merge remote-tracking branch 'upstream/devel' into devel

Han Wang · Han Wang · commit ca97d30e1057 · 2019-10-14T18:14:06.000+08:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "wheel", "scikit-build", "cmake", "ninja"]
+requires = ["setuptools", "wheel", "scikit-build", "cmake", "ninja", "m2r"]
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`[build-system]`
`2`		`-requires = ["setuptools", "wheel", "scikit-build", "cmake", "ninja"]`
	`2`	`+requires = ["setuptools", "wheel", "scikit-build", "cmake", "ninja", "m2r"]`
`3`	`3`