Skip to content

Commit 040a8cb

Browse files
authored
Feature flag: remove UPDATE_CONDA_STARTUP (#10494)
This can now be done by using `build.jobs.pre_create_environment`: #10493
1 parent 8fd4342 commit 040a8cb

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
@@ -385,28 +385,7 @@ def conda_bin_name(self):
385385
return self.config.python_interpreter
386386
return 'conda'
387387

388-
def _update_conda_startup(self):
389-
"""
390-
Update ``conda`` before use it for the first time.
391-
392-
This makes the Docker image to use the latest version of ``conda``
393-
independently the version of Miniconda that it has installed.
394-
"""
395-
self.build_env.run(
396-
'conda',
397-
'update',
398-
'--yes',
399-
'--quiet',
400-
'--name=base',
401-
'--channel=defaults',
402-
'conda',
403-
cwd=self.checkout_path,
404-
)
405-
406388
def setup_base(self):
407-
if self.project.has_feature(Feature.UPDATE_CONDA_STARTUP):
408-
self._update_conda_startup()
409-
410389
if self.project.has_feature(Feature.CONDA_APPEND_CORE_REQUIREMENTS):
411390
self._append_core_requirements()
412391
self._show_environment_yaml()

readthedocs/projects/models.py

-5
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,6 @@ def add_features(sender, **kwargs):
19281928
MKDOCS_THEME_RTD = "mkdocs_theme_rtd"
19291929
API_LARGE_DATA = "api_large_data"
19301930
DONT_SHALLOW_CLONE = "dont_shallow_clone"
1931-
UPDATE_CONDA_STARTUP = "update_conda_startup"
19321931
CONDA_APPEND_CORE_REQUIREMENTS = "conda_append_core_requirements"
19331932
ALL_VERSIONS_IN_HTML_CONTEXT = "all_versions_in_html_context"
19341933
CDN_ENABLED = "cdn_enabled"
@@ -1977,10 +1976,6 @@ def add_features(sender, **kwargs):
19771976
API_LARGE_DATA,
19781977
_("Build: Try alternative method of posting large data"),
19791978
),
1980-
(
1981-
UPDATE_CONDA_STARTUP,
1982-
_("Conda: Upgrade conda before creating the environment"),
1983-
),
19841979
(
19851980
CONDA_APPEND_CORE_REQUIREMENTS,
19861981
_("Conda: Append Read the Docs core requirements to environment.yml file"),

0 commit comments

Comments
 (0)