Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature flag: remove UPDATE_CONDA_STARTUP #10494

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Feature flag: remove UPDATE_CONDA_STARTUP #10494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions readthedocs/doc_builder/python_environments.py
View file
Open in desktop
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
View file
Open in desktop
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