From ad0e0a292b6da93a2635f73447fb799ec1e644c1 Mon Sep 17 00:00:00 2001
From: Illviljan <14371165+Illviljan@users.noreply.github.com>
Date: Sat, 14 May 2022 22:32:40 +0200
Subject: [PATCH 1/3] Test adding setuptools to required install

---
 asv_bench/asv.conf.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json
index 3e4137cf807..d9b2c4de5de 100644
--- a/asv_bench/asv.conf.json
+++ b/asv_bench/asv.conf.json
@@ -58,6 +58,9 @@
     //     "pip+emcee": [""],   // emcee is only available for install with pip.
     // },
     "matrix": {
+        // gh6606:
+        "setuptools": [""],
+        "setuptools_scm[toml]": [""],
         "numpy": [""],
         "pandas": [""],
         "netcdf4": [""],

From 96156b9c8773622a53273c9960dc85e56fbe0059 Mon Sep 17 00:00:00 2001
From: Illviljan <14371165+Illviljan@users.noreply.github.com>
Date: Sat, 14 May 2022 22:38:53 +0200
Subject: [PATCH 2/3] Update asv.conf.json

---
 asv_bench/asv.conf.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json
index d9b2c4de5de..ae14a4f071e 100644
--- a/asv_bench/asv.conf.json
+++ b/asv_bench/asv.conf.json
@@ -58,9 +58,10 @@
     //     "pip+emcee": [""],   // emcee is only available for install with pip.
     // },
     "matrix": {
-        // gh6606:
-        "setuptools": [""],
+        // GH6606:
+        // "setuptools": [""],
         "setuptools_scm[toml]": [""],
+        "setuptools_scm_git_archive": [""],
         "numpy": [""],
         "pandas": [""],
         "netcdf4": [""],

From 4445e445cb51491f6c1897f2b451610e8d62b8d0 Mon Sep 17 00:00:00 2001
From: Illviljan <14371165+Illviljan@users.noreply.github.com>
Date: Sat, 14 May 2022 23:11:39 +0200
Subject: [PATCH 3/3] Update asv.conf.json

---
 asv_bench/asv.conf.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json
index ae14a4f071e..c9ddbd94b69 100644
--- a/asv_bench/asv.conf.json
+++ b/asv_bench/asv.conf.json
@@ -58,10 +58,8 @@
     //     "pip+emcee": [""],   // emcee is only available for install with pip.
     // },
     "matrix": {
-        // GH6606:
-        // "setuptools": [""],
-        "setuptools_scm[toml]": [""],
-        "setuptools_scm_git_archive": [""],
+        "setuptools_scm[toml]": [""],  // GH6609
+        "setuptools_scm_git_archive": [""],  // GH6609
         "numpy": [""],
         "pandas": [""],
         "netcdf4": [""],