Merge branch 'master' into 3.2

.readthedocs.yml

@@ -1,8 +1,15 @@
-# Reference: https://docs.readthedocs.io/en/latest/yaml-config.html
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
 
 build:
   image: latest
 
+sphinx:
+  configuration: conf.py
+
 # Possible options: htmlzip, pdf, epub
 # All disabled for now:
 # - single-page htmlzip is too big to be usable, and requires too much memory.
@@ -14,3 +21,7 @@ build:
 # then, all offline download options are worthless.
 # (Track https://github.com/readthedocs/readthedocs.org/issues/3242)
 formats: []
+
+python:
+  install:
+    - requirements: requirements.txt