From b521ec9d6c9f48361d7084d93c77e84ac3543ba3 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 19 Jan 2021 13:37:03 -0500 Subject: [PATCH 1/2] PR preview: don't call to version.vcs_url vcs_url is making a call to the db somewhere. --- readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl index 094acef0b96..979d977f8d0 100644 --- a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl +++ b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl @@ -154,7 +154,8 @@ else: # Add External version warning banner to the external version documentation if '{{ version.type }}' == 'external': extensions.insert(1, "readthedocs_ext.external_version_warning") - readthedocs_vcs_url = '{{ version.vcs_url }}' + # TODO: This is calling the db, we should find where. + # readthedocs_vcs_url = '{{ version.vcs_url }}' readthedocs_build_url = '{{ build_url }}' project_language = '{{ project.language }}' From 94386d3a364fc506077be4b325f7f062acb1a674 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 19 Jan 2021 13:43:47 -0500 Subject: [PATCH 2/2] Only evaluate on external versions --- readthedocs/doc_builder/backends/sphinx.py | 5 +++++ readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/readthedocs/doc_builder/backends/sphinx.py b/readthedocs/doc_builder/backends/sphinx.py index 90db1176644..051e776357f 100644 --- a/readthedocs/doc_builder/backends/sphinx.py +++ b/readthedocs/doc_builder/backends/sphinx.py @@ -156,6 +156,10 @@ def get_config_params(self): protocol = 'http' if settings.DEBUG else 'https' build_url = f'{protocol}://{settings.PRODUCTION_DOMAIN}{build_url}' + vcs_url = None + if self.version.is_external: + vcs_url = self.version.vcs_url + data = { 'html_theme': 'sphinx_rtd_theme', 'html_theme_import': 'sphinx_rtd_theme', @@ -170,6 +174,7 @@ def get_config_params(self): 'downloads': downloads, 'subproject_urls': subproject_urls, 'build_url': build_url, + 'vcs_url': vcs_url, # GitHub 'github_user': github_user, diff --git a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl index 979d977f8d0..e2c5a4bf95f 100644 --- a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl +++ b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl @@ -154,8 +154,7 @@ else: # Add External version warning banner to the external version documentation if '{{ version.type }}' == 'external': extensions.insert(1, "readthedocs_ext.external_version_warning") - # TODO: This is calling the db, we should find where. - # readthedocs_vcs_url = '{{ version.vcs_url }}' + readthedocs_vcs_url = '{{ vcs_url }}' readthedocs_build_url = '{{ build_url }}' project_language = '{{ project.language }}'