Merge branch 'master' into refactor/teardown

mergify[bot] · web-flow · commit 72ad287f0dc7 · 2021-02-15T21:04:33.000Z
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,4 +1,4 @@
-sphinx>=3.0
+sphinx>=3.0, !=3.5  # fails with sphinx.ext.viewcode
 recommonmark  # fails with badges
 m2r  # fails with multi-line text
 nbsphinx>=0.8

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sphinx>=3.0`
	`1`	`+sphinx>=3.0, !=3.5 # fails with sphinx.ext.viewcode`
`2`	`2`	`recommonmark # fails with badges`
`3`	`3`	`m2r # fails with multi-line text`
`4`	`4`	`nbsphinx>=0.8`