diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2021-02-12 15:06:21 -0500 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2021-02-12 15:06:21 -0500 |
| commit | 450e27c07ce79c7bccbd1b0b1d9b4a011c72349a (patch) | |
| tree | 72e558be3cb0fe2a0cb34a0f06ad60049b96aed8 | |
| parent | d0a01fa5a9dbdac686bac6025d62855a1b35f64d (diff) | |
| parent | 5ad689f70b188e11b88b63c239defcab3feac2a3 (diff) | |
| download | paramiko-450e27c07ce79c7bccbd1b0b1d9b4a011c72349a.tar.gz | |
Merge branch '2.5' into 2.6
| -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 f4f84748..22ac76ad 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 . |