summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2021-02-12 12:48:16 -0500
committerJeff Forcier <jeff@bitprophet.org>2021-02-12 12:48:16 -0500
commit99d2b88eb8c5bc1be71e7d65a265ccb9ca8d315c (patch)
tree97d668367584217cd86ddd18fbfd18eefb372c8f
parent728f3d98f1f3999b284e2e6dcbce8581ee2bd231 (diff)
parentd0a01fa5a9dbdac686bac6025d62855a1b35f64d (diff)
downloadparamiko-99d2b88eb8c5bc1be71e7d65a265ccb9ca8d315c.tar.gz
Merge branch '2.6' into 2.7
-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"