From 706765e1e8bd04a4b2ec79ed163421546cdce12f Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sun, 31 Oct 2021 21:05:54 +0300 Subject: [PATCH 1/2] Fixes RTD, refs #11412 --- .readthedocs.yml | 12 ++++++++++++ test-requirements.txt | 1 + 2 files changed, 13 insertions(+) create mode 100644 .readthedocs.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 000000000000..13be2e438d77 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,12 @@ +version: 2 + +python: + version: 3.7 + install: + - requirements: test-requirements.txt + +sphinx: + configuration: docs/source/conf.py + fail_on_warning: true + +formats: all diff --git a/test-requirements.txt b/test-requirements.txt index 2756dd11986f..37e8627349bd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,4 +14,5 @@ py>=1.5.2 typed_ast>=1.4.0,<1.5.0; python_version>='3.8' virtualenv>=20.6.0 setuptools!=50 +sphinx>=4.2.0,<5.0.0 importlib-metadata>=4.6.1,<5.0.0 From 84f3c811be5f1c9cf08837707294869a6e9b7272 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Mon, 1 Nov 2021 00:35:27 +0300 Subject: [PATCH 2/2] Use requirements-docs.txt --- .readthedocs.yml | 2 +- docs/requirements-docs.txt | 4 ++-- test-requirements.txt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 13be2e438d77..1154ca2daf5d 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,7 +3,7 @@ version: 2 python: version: 3.7 install: - - requirements: test-requirements.txt + - requirements: docs/requirements-docs.txt sphinx: configuration: docs/source/conf.py diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index d20641e7edf5..7e3d31ebea98 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,2 +1,2 @@ -Sphinx >= 1.4.4 -sphinx-rtd-theme >= 0.1.9 +sphinx>=4.2.0,<5.0.0 +sphinx-rtd-theme>=1.0.0,<2.0.0 diff --git a/test-requirements.txt b/test-requirements.txt index 37e8627349bd..2756dd11986f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,5 +14,4 @@ py>=1.5.2 typed_ast>=1.4.0,<1.5.0; python_version>='3.8' virtualenv>=20.6.0 setuptools!=50 -sphinx>=4.2.0,<5.0.0 importlib-metadata>=4.6.1,<5.0.0