Skip to content

Commit cc255e3

Browse files
committed
Adjust other installations of setuptools
1 parent b83c65d commit cc255e3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

readthedocs/doc_builder/python_environments.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ def install_core_requirements(self):
480480
positive='pip<20.3',
481481
negative='pip',
482482
)
483-
cmd = pip_install_cmd + [pip_version, 'setuptools']
483+
cmd = pip_install_cmd + [pip_version, 'setuptools<58.3.0']
484484
self.build_env.run(
485485
*cmd, bin_path=self.venv_bin(), cwd=self.checkout_path
486486
)

readthedocs/rtd_tests/tests/test_doc_building.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ def test_install_core_requirements_sphinx(self, checkout_path):
12341234
self.assertEqual(self.build_env_mock.run.call_count, 2)
12351235
calls = self.build_env_mock.run.call_args_list
12361236

1237-
core_args = self.pip_install_args + ['pip', 'setuptools']
1237+
core_args = self.pip_install_args + ['pip', 'setuptools<58.3.0']
12381238
self.assertArgsStartsWith(core_args, calls[0])
12391239

12401240
requirements = self.base_requirements + requirements_sphinx
@@ -1259,7 +1259,7 @@ def test_install_core_requirements_mkdocs(self, checkout_path):
12591259
self.assertEqual(self.build_env_mock.run.call_count, 2)
12601260
calls = self.build_env_mock.run.call_args_list
12611261

1262-
core_args = self.pip_install_args + ['pip', 'setuptools']
1262+
core_args = self.pip_install_args + ['pip', 'setuptools<58.3.0']
12631263
self.assertArgsStartsWith(core_args, calls[0])
12641264

12651265
requirements = self.base_requirements + requirements_mkdocs

0 commit comments

Comments
 (0)