Skip to content

Commit e5919c2

Browse files
committed
Feature flag: remove UPDATE_CONDA_STARTUP
This can now be done by using `build.jobs.pre_create_environment`: #10493
1 parent 6f394fd commit e5919c2

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

readthedocs/doc_builder/python_environments.py

-21
Original file line numberDiff line numberDiff line change
@@ -335,28 +335,7 @@ def conda_bin_name(self):
335335
return self.config.python_interpreter
336336
return 'conda'
337337

338-
def _update_conda_startup(self):
339-
"""
340-
Update ``conda`` before use it for the first time.
341-
342-
This makes the Docker image to use the latest version of ``conda``
343-
independently the version of Miniconda that it has installed.
344-
"""
345-
self.build_env.run(
346-
'conda',
347-
'update',
348-
'--yes',
349-
'--quiet',
350-
'--name=base',
351-
'--channel=defaults',
352-
'conda',
353-
cwd=self.checkout_path,
354-
)
355-
356338
def setup_base(self):
357-
if self.project.has_feature(Feature.UPDATE_CONDA_STARTUP):
358-
self._update_conda_startup()
359-
360339
if self.project.has_feature(Feature.CONDA_APPEND_CORE_REQUIREMENTS):
361340
self._append_core_requirements()
362341
self._show_environment_yaml()

readthedocs/projects/models.py

-5
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,6 @@ def add_features(sender, **kwargs):
19051905
MKDOCS_THEME_RTD = "mkdocs_theme_rtd"
19061906
API_LARGE_DATA = "api_large_data"
19071907
DONT_SHALLOW_CLONE = "dont_shallow_clone"
1908-
UPDATE_CONDA_STARTUP = "update_conda_startup"
19091908
CONDA_APPEND_CORE_REQUIREMENTS = "conda_append_core_requirements"
19101909
ALL_VERSIONS_IN_HTML_CONTEXT = "all_versions_in_html_context"
19111910
CDN_ENABLED = "cdn_enabled"
@@ -1960,10 +1959,6 @@ def add_features(sender, **kwargs):
19601959
API_LARGE_DATA,
19611960
_("Build: Try alternative method of posting large data"),
19621961
),
1963-
(
1964-
UPDATE_CONDA_STARTUP,
1965-
_("Conda: Upgrade conda before creating the environment"),
1966-
),
19671962
(
19681963
CONDA_APPEND_CORE_REQUIREMENTS,
19691964
_("Conda: Append Read the Docs core requirements to environment.yml file"),

0 commit comments

Comments
 (0)