diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2021-02-12 15:06:22 -0500 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2021-02-12 15:06:22 -0500 |
| commit | 190752aca5c96460880e99af314b501ac2178b06 (patch) | |
| tree | 05df4db78e11f7e6502a2f01383c241a3e837ab4 | |
| parent | 99d2b88eb8c5bc1be71e7d65a265ccb9ca8d315c (diff) | |
| parent | 450e27c07ce79c7bccbd1b0b1d9b4a011c72349a (diff) | |
| download | paramiko-190752aca5c96460880e99af314b501ac2178b06.tar.gz | |
Merge branch '2.6' into 2.7
| -rw-r--r-- | .readthedocs.yml | 15 | ||||
| -rw-r--r-- | dev-requirements.txt | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/.readthedocs.yml b/.readthedocs.yml index 0a214ea7..1f6737f4 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,10 +1,19 @@ -# 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 +formats: all + 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" + +python: + version: 3.7 + install: + - requirements: dev-requirements.txt + system_packages: false + +# NOTE: leaving sphinx.* alone as there's currently no way to differ the conf +# file used based on project (so cannot differentiate between www and docs). +# The web UI setting for that SHOULD take precedence? diff --git a/dev-requirements.txt b/dev-requirements.txt index 142153bd..56f53ad9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -19,3 +19,5 @@ releases>=1.5,<2.0 semantic_version>=2.4,<2.5 wheel==0.24 twine==1.11.0 +# Self +-e . |