From cc255e3197a6f9d018dc37ffbf171e3e387d4d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Mon, 29 Nov 2021 19:02:56 +0100 Subject: [PATCH] Adjust other installations of setuptools --- readthedocs/doc_builder/python_environments.py | 2 +- readthedocs/rtd_tests/tests/test_doc_building.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index b804fb191ef..893e0ddf01a 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -480,7 +480,7 @@ def install_core_requirements(self): positive='pip<20.3', negative='pip', ) - cmd = pip_install_cmd + [pip_version, 'setuptools'] + cmd = pip_install_cmd + [pip_version, 'setuptools<58.3.0'] self.build_env.run( *cmd, bin_path=self.venv_bin(), cwd=self.checkout_path ) diff --git a/readthedocs/rtd_tests/tests/test_doc_building.py b/readthedocs/rtd_tests/tests/test_doc_building.py index f0b8599ad6c..c76244ab77d 100644 --- a/readthedocs/rtd_tests/tests/test_doc_building.py +++ b/readthedocs/rtd_tests/tests/test_doc_building.py @@ -1234,7 +1234,7 @@ def test_install_core_requirements_sphinx(self, checkout_path): self.assertEqual(self.build_env_mock.run.call_count, 2) calls = self.build_env_mock.run.call_args_list - core_args = self.pip_install_args + ['pip', 'setuptools'] + core_args = self.pip_install_args + ['pip', 'setuptools<58.3.0'] self.assertArgsStartsWith(core_args, calls[0]) requirements = self.base_requirements + requirements_sphinx @@ -1259,7 +1259,7 @@ def test_install_core_requirements_mkdocs(self, checkout_path): self.assertEqual(self.build_env_mock.run.call_count, 2) calls = self.build_env_mock.run.call_args_list - core_args = self.pip_install_args + ['pip', 'setuptools'] + core_args = self.pip_install_args + ['pip', 'setuptools<58.3.0'] self.assertArgsStartsWith(core_args, calls[0]) requirements = self.base_requirements + requirements_mkdocs