From b7caf1f36e8638760605401c0feae56f2b79d7fd Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 2 Nov 2021 00:09:47 +0000 Subject: [PATCH] Merge branch 'rtd' into 'master' Fix readthedocs config See merge request OpenMW/openmw!1340 (cherry picked from commit ade3c2c61b29665abfa7562e96ee157c83a89def) 665d756f Fix readthedocs config --- .readthedocs.yaml | 10 ++++++++++ docs/requirements.txt | 2 +- readthedocs.yml | 2 -- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 .readthedocs.yaml delete mode 100644 readthedocs.yml diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..e0b39ec49 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,10 @@ +version: 2 + +sphinx: + configuration: docs/source/conf.py + +python: + version: 3.8 + install: + - requirements: docs/requirements.txt + diff --git a/docs/requirements.txt b/docs/requirements.txt index 288d462d0..14c09d53e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ parse_cmake -sphinx>=1.7.0 +sphinx==1.8.5 diff --git a/readthedocs.yml b/readthedocs.yml deleted file mode 100644 index e53e54b78..000000000 --- a/readthedocs.yml +++ /dev/null @@ -1,2 +0,0 @@ -# Don't build any extra formats -formats: [] \ No newline at end of file