Build: use same version of setuptools when using system_pacakges

stsewd · stsewd · commit 92429964f26b · 2023-05-03T10:40:54.000-05:00
The same version installed before needs to match here. Fixes #10285
diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py
@@ -251,7 +251,7 @@ def install_core_requirements(self):
             # If this flag is present,
             # we need to cap setuptools again.
             # See https://github.com/readthedocs/readthedocs.org/issues/8775
-            requirements.append('setuptools<58.3.0')
+            requirements.append(setuptools_version)
         cmd.extend(requirements)
         self.build_env.run(
             *cmd,
diff --git a/readthedocs/rtd_tests/tests/test_doc_building.py b/readthedocs/rtd_tests/tests/test_doc_building.py
@@ -451,7 +451,7 @@ def test_install_core_requirements_sphinx_system_packages_caps_setuptools(self,
             "sphinx-rtd-theme",
             "readthedocs-sphinx-ext",
             "jinja2<3.1.0",
-            "setuptools<58.3.0",
+            "setuptools",
         ]
 
         self.assertEqual(self.build_env_mock.run.call_count, 2)

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ def test_install_core_requirements_sphinx_system_packages_caps_setuptools(self,`
`451`	`451`	`"sphinx-rtd-theme",`
`452`	`452`	`"readthedocs-sphinx-ext",`
`453`	`453`	`"jinja2<3.1.0",`
`454`		`- "setuptools<58.3.0",`
	`454`	`+ "setuptools",`
`455`	`455`	`]`
`456`	`456`
`457`	`457`	`self.assertEqual(self.build_env_mock.run.call_count, 2)`