From 965261c8eb4eecdc4afff363e69f38a004c3e592 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Tue, 29 Mar 2022 10:12:05 -0700 Subject: [PATCH 1/2] Fix tests around jinja2 --- .../rtd_tests/tests/test_doc_building.py | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/readthedocs/rtd_tests/tests/test_doc_building.py b/readthedocs/rtd_tests/tests/test_doc_building.py index 937001d63a6..0004d5bc0ea 100644 --- a/readthedocs/rtd_tests/tests/test_doc_building.py +++ b/readthedocs/rtd_tests/tests/test_doc_building.py @@ -1,7 +1,7 @@ -from itertools import zip_longest import os import tempfile import uuid +from itertools import zip_longest from unittest import mock from unittest.mock import Mock, PropertyMock, patch @@ -407,11 +407,12 @@ def test_install_core_requirements_sphinx(self, checkout_path): ) python_env.install_core_requirements() requirements_sphinx = [ - 'commonmark', - 'recommonmark', - 'sphinx', - 'sphinx-rtd-theme', - 'readthedocs-sphinx-ext', + "commonmark", + "recommonmark", + "sphinx", + "sphinx-rtd-theme", + "readthedocs-sphinx-ext", + "jinja2<3.1.0", ] self.assertEqual(self.build_env_mock.run.call_count, 2) @@ -444,12 +445,13 @@ def test_install_core_requirements_sphinx_system_packages_caps_setuptools(self, ) python_env.install_core_requirements() requirements_sphinx = [ - 'commonmark', - 'recommonmark', - 'sphinx', - 'sphinx-rtd-theme', - 'readthedocs-sphinx-ext', - 'setuptools<58.3.0', + "commonmark", + "recommonmark", + "sphinx", + "sphinx-rtd-theme", + "readthedocs-sphinx-ext", + "jinja2<3.1.0", + "setuptools<58.3.0", ] self.assertEqual(self.build_env_mock.run.call_count, 2) From 70679a3ae4f46fa93f89262ea4c379096c8e47f7 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Tue, 29 Mar 2022 11:02:12 -0700 Subject: [PATCH 2/2] Fix one more test --- readthedocs/projects/tests/test_build_tasks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/readthedocs/projects/tests/test_build_tasks.py b/readthedocs/projects/tests/test_build_tasks.py index 81c9def784b..57e53f2771a 100644 --- a/readthedocs/projects/tests/test_build_tasks.py +++ b/readthedocs/projects/tests/test_build_tasks.py @@ -524,6 +524,7 @@ def test_build_commands_executed(self, load_yaml_config): "sphinx<2", "sphinx-rtd-theme<0.5", "readthedocs-sphinx-ext<2.2", + "jinja2<3.1.0", bin_path=mock.ANY, cwd=mock.ANY, ),