From e5919c28daea2716e92ee67d4221c17c4a1e0c2b Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 28 Jun 2023 16:42:32 +0200 Subject: [PATCH] Feature flag: remove UPDATE_CONDA_STARTUP This can now be done by using `build.jobs.pre_create_environment`: #10493 --- .../doc_builder/python_environments.py | 21 ------------------- readthedocs/projects/models.py | 5 ----- 2 files changed, 26 deletions(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index 0b85408400f..c9389e0b9ac 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -335,28 +335,7 @@ def conda_bin_name(self): return self.config.python_interpreter return 'conda' - def _update_conda_startup(self): - """ - Update ``conda`` before use it for the first time. - - This makes the Docker image to use the latest version of ``conda`` - independently the version of Miniconda that it has installed. - """ - self.build_env.run( - 'conda', - 'update', - '--yes', - '--quiet', - '--name=base', - '--channel=defaults', - 'conda', - cwd=self.checkout_path, - ) - def setup_base(self): - if self.project.has_feature(Feature.UPDATE_CONDA_STARTUP): - self._update_conda_startup() - if self.project.has_feature(Feature.CONDA_APPEND_CORE_REQUIREMENTS): self._append_core_requirements() self._show_environment_yaml() diff --git a/readthedocs/projects/models.py b/readthedocs/projects/models.py index 42287cadc61..42610bb2017 100644 --- a/readthedocs/projects/models.py +++ b/readthedocs/projects/models.py @@ -1905,7 +1905,6 @@ def add_features(sender, **kwargs): MKDOCS_THEME_RTD = "mkdocs_theme_rtd" API_LARGE_DATA = "api_large_data" DONT_SHALLOW_CLONE = "dont_shallow_clone" - UPDATE_CONDA_STARTUP = "update_conda_startup" CONDA_APPEND_CORE_REQUIREMENTS = "conda_append_core_requirements" ALL_VERSIONS_IN_HTML_CONTEXT = "all_versions_in_html_context" CDN_ENABLED = "cdn_enabled" @@ -1960,10 +1959,6 @@ def add_features(sender, **kwargs): API_LARGE_DATA, _("Build: Try alternative method of posting large data"), ), - ( - UPDATE_CONDA_STARTUP, - _("Conda: Upgrade conda before creating the environment"), - ), ( CONDA_APPEND_CORE_REQUIREMENTS, _("Conda: Append Read the Docs core requirements to environment.yml file"),