From f11a065cfb5bba9c570ce939f19ed3773a27db6b Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 6 Oct 2020 17:30:37 -0500 Subject: [PATCH 1/2] Builds: always install latest version of our sphinx extension I'm not removing the feature, as it can be used in the future. --- readthedocs/doc_builder/python_environments.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index 864e8dbaaaa..28d5fc08448 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -381,11 +381,7 @@ def install_core_requirements(self): negative='sphinx<2', ), 'sphinx-rtd-theme<0.5', - self.project.get_feature_value( - Feature.USE_SPHINX_RTD_EXT_LATEST, - positive='readthedocs-sphinx-ext', - negative='readthedocs-sphinx-ext<1.1', - ), + 'readthedocs-sphinx-ext', ]) cmd = copy.copy(pip_install_cmd) From 47eaa308194a433eb0d73a264bd4d7c590afe540 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 20 Oct 2020 14:19:14 -0500 Subject: [PATCH 2/2] Install <2.2 --- readthedocs/doc_builder/python_environments.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index 28d5fc08448..c4eda1a1a5c 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -381,7 +381,11 @@ def install_core_requirements(self): negative='sphinx<2', ), 'sphinx-rtd-theme<0.5', - 'readthedocs-sphinx-ext', + self.project.get_feature_value( + Feature.USE_SPHINX_RTD_EXT_LATEST, + positive='readthedocs-sphinx-ext', + negative='readthedocs-sphinx-ext<2.2', + ), ]) cmd = copy.copy(pip_install_cmd)