summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2021-02-12 12:48:21 -0500
committerJeff Forcier <jeff@bitprophet.org>2021-02-12 12:48:21 -0500
commitc2f030f6a88ce7ea06050da841a56a63be6e9ed3 (patch)
treed139dec99b57bc8eee5050980217fe0a6c783d15
parenta292cc1e38585676b9a6bed32b462d04453c8db3 (diff)
parent99d2b88eb8c5bc1be71e7d65a265ccb9ca8d315c (diff)
Merge branch '2.7' into master
-rw-r--r--.readthedocs.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 00000000..0a214ea7
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,10 @@
+# NOTE: not migrating other settings into this file yet as I don't know how
+# well they'd play with our 'dual doc trees' setup. But the below should apply
+# to both equally.
+version: 2
+
+build:
+ # Specific version of RTD docker image that's new enough to have Rust around
+ # (so Cryptography can build from source if needed).
+ # See https://github.com/readthedocs/readthedocs-docker-images
+ image: "7.0"