Merge pull request #1403 from h-mayorquin/main

[Bug] Fix deprecation of --force in conda for conda versions >= 24.3.0
airspeed-velocity · Jun 4, 2024 · 4af8c69 · 4af8c69
2 parents 6cc8f94 + e411c0b
commit 4af8c69
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/asv/plugins/conda.py b/asv/plugins/conda.py
@@ -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