Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions asv/plugins/conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,18 @@ def _setup(self):
env_file.close()
try:
env_file_name = self._conda_environment_file or env_file.name
self._run_conda(['env', 'create', '-f', env_file_name,
'-p', self._path, '--force'],

conda_version = self._run_conda(['--version'], env=env)
log.info(f"conda version: {conda_version}")
# https://conda.io/projects/conda/en/latest/release-notes.html#id8
if conda_version >= "24.3.0":
self._run_conda(['env', 'create', '-f', env_file_name,
'-p', self._path, "--yes"],
env=env)
else: # Backward compatbility
self._run_conda(['env', 'create', '-f', env_file_name,
'-p', self._path, '--force'],
env=env)

if self._conda_environment_file and (conda_args or pip_args):
# Add extra packages
Expand Down