From 02bf5a90a68553a213098abfe1b0df04f561d4ad Mon Sep 17 00:00:00 2001
From: sfmig <33267254+sfmig@users.noreply.github.com>
Date: Sat, 17 Aug 2024 23:16:21 +0100
Subject: [PATCH 1/4] BUG: fix extraction of conda version

---
 asv/plugins/conda.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/asv/plugins/conda.py b/asv/plugins/conda.py
index 2819f4a67..27969dceb 100644
--- a/asv/plugins/conda.py
+++ b/asv/plugins/conda.py
@@ -147,7 +147,10 @@ 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":

From d8c398a7b62ce7cf142cb7e7e67b620f257b418c Mon Sep 17 00:00:00 2001
From: sfmig <33267254+sfmig@users.noreply.github.com>
Date: Sat, 17 Aug 2024 23:17:41 +0100
Subject: [PATCH 2/4] ENH: use packaging.version.Version for comparing version
 strings

---
 asv/plugins/conda.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/asv/plugins/conda.py b/asv/plugins/conda.py
index 27969dceb..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
 
@@ -153,7 +155,7 @@ def _setup(self):
                 )[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)

From f37b51165b9ab1f7037c3a16f32ecf7cbf7d9d8a Mon Sep 17 00:00:00 2001
From: sfmig <33267254+sfmig@users.noreply.github.com>
Date: Sat, 17 Aug 2024 23:39:48 +0100
Subject: [PATCH 3/4] MAINT: pin setuptools

---
 pyproject.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8d2e4a8eb..bdf4559f6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -83,7 +83,9 @@ plugs = [
 [build-system]
 requires = [
     "wheel",
-    "setuptools>=64",
+    # pin setuptools:
+    # https://github.com/airspeed-velocity/asv/pull/1426#issuecomment-2290658198
+    "setuptools>=64,<72.2.0",
     "setuptools_scm>=6",
 ]
 build-backend = "setuptools.build_meta"

From ddac01a489bd1df375089b19a7eb5f5917ead1d7 Mon Sep 17 00:00:00 2001
From: sfmig <33267254+sfmig@users.noreply.github.com>
Date: Sun, 25 Aug 2024 21:01:01 +0100
Subject: [PATCH 4/4] DOC: add to author list

---
 docs/source/credits.rst | 1 +
 1 file changed, 1 insertion(+)

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