diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2023-09-23 20:00:44 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2023-09-23 20:00:44 -0400 |
| commit | 66117732de6de03914308f9a21b05b50a781d13c (patch) | |
| tree | 058e9f0c809eb6aad7250a35ed14e16355e4dc5a | |
| parent | e861c7697622774071ce73b46ffe8817eacdedfa (diff) | |
| parent | 34c102fd15630b2d2559cb112d4d3e3b2ce846e7 (diff) | |
Merge branch '3.3'
| -rw-r--r-- | .readthedocs.yml | 16 | ||||
| -rw-r--r-- | sites/docs/.readthedocs.yaml | 13 | ||||
| -rw-r--r-- | sites/www/.readthedocs.yaml | 13 |
3 files changed, 26 insertions, 16 deletions
diff --git a/.readthedocs.yml b/.readthedocs.yml deleted file mode 100644 index e8bc9a31..00000000 --- a/.readthedocs.yml +++ /dev/null @@ -1,16 +0,0 @@ -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" - -python: - version: 3.7 - install: - - requirements: dev-requirements.txt - -# 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/sites/docs/.readthedocs.yaml b/sites/docs/.readthedocs.yaml new file mode 100644 index 00000000..3212c930 --- /dev/null +++ b/sites/docs/.readthedocs.yaml @@ -0,0 +1,13 @@ +version: 2 + +build: + os: "ubuntu-22.04" + tools: + python: "3.7" + +python: + install: + - requirements: dev-requirements.txt + +sphinx: + configuration: sites/docs/conf.py diff --git a/sites/www/.readthedocs.yaml b/sites/www/.readthedocs.yaml new file mode 100644 index 00000000..4f7d397e --- /dev/null +++ b/sites/www/.readthedocs.yaml @@ -0,0 +1,13 @@ +version: 2 + +build: + os: "ubuntu-22.04" + tools: + python: "3.7" + +python: + install: + - requirements: dev-requirements.txt + +sphinx: + configuration: sites/www/conf.py |