From 92429964f26baa67fcb6de7cd2c7d6766e4d818f Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Wed, 3 May 2023 10:40:54 -0500 Subject: [PATCH 1/2] Build: use same version of setuptools when using `system_pacakges` The same version installed before needs to match here. Fixes https://github.com/readthedocs/readthedocs.org/issues/10285 --- readthedocs/doc_builder/python_environments.py | 2 +- readthedocs/rtd_tests/tests/test_doc_building.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index 1d4f3b51dac..7eae5129030 100644 --- 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 index 94de21ffccc..adb57db0495 100644 --- 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) From f0a1f93fdb8517c0b61bb4d07b18007e83ba48c4 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Wed, 3 May 2023 11:19:46 -0500 Subject: [PATCH 2/2] Update comment --- readthedocs/doc_builder/python_environments.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index 7eae5129030..77cae1705ed 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -248,9 +248,7 @@ def install_core_requirements(self): # even if it is already installed system-wide (and # --system-site-packages is used) cmd.append('-I') - # If this flag is present, - # we need to cap setuptools again. - # See https://github.com/readthedocs/readthedocs.org/issues/8775 + # The same version of setuptools used above needs to be used here. requirements.append(setuptools_version) cmd.extend(requirements) self.build_env.run(