diff --git a/asv/plugins/conda.py b/asv/plugins/conda.py index 2819f4a67..ad983c64c 100644 --- a/asv/plugins/conda.py +++ b/asv/plugins/conda.py @@ -5,6 +5,8 @@ import contextlib from pathlib import Path +from packaging.version import Version + from .. import environment, util from ..console import log @@ -147,10 +149,13 @@ def _setup(self): try: env_file_name = self._conda_environment_file or env_file.name - conda_version = self._run_conda(['--version'], env=env) + conda_version = re.search( + r'\d+(\.\d+)+', + self._run_conda(['--version'], env=env) + )[0] log.info(f"conda version: {conda_version}") # https://conda.io/projects/conda/en/latest/release-notes.html#id8 - if conda_version >= "24.3.0": + if Version(conda_version) >= Version("24.3.0"): self._run_conda(['env', 'create', '-f', env_file_name, '-p', self._path, "--yes"], env=env) diff --git a/docs/source/credits.rst b/docs/source/credits.rst index 3432ab6b6..00e94d5b9 100644 --- a/docs/source/credits.rst +++ b/docs/source/credits.rst @@ -73,6 +73,7 @@ The rest of the contributors are listed in alphabetical order. - Rok Mihevc - Sayed Adel - serge-sans-paille +- Sofía Miñano - Sourcery AI - Thomas Pfaff - Thomas Robitaille