Skip to content

Commit

Permalink
Feature flag: remove UPDATE_CONDA_STARTUP
Browse files Browse the repository at this point in the history
This can now be done by using `build.jobs.pre_create_environment`: #10493
  • Loading branch information
humitos committed Jun 28, 2023
1 parent 6f394fd commit e5919c2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 26 deletions.
21 changes: 0 additions & 21 deletions readthedocs/doc_builder/python_environments.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 0 additions & 5 deletions readthedocs/projects/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"),
Expand Down

0 comments on commit e5919c2

Please sign in to comment.