From 051f0ddb316127867c3fd222126e2e1193810aaa Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Tue, 30 Apr 2024 09:47:53 -0600
Subject: [PATCH 01/15] specify/pin micromamba version in asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index db63b405..6cf70098 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -36,6 +36,7 @@ jobs:
         continue-on-error: true
         uses: mamba-org/setup-micromamba@v1
         with:
+          micromamba-version: "1.5.7-0"
           environment-file: ./build_envs/asv-bench.yml
           cache-environment: true
           cache-environment-key: "benchmark-${{runner.os}}-${{runner.arch}}-${{env.TODAY}}"

From ab71532074e315be810d5196cb1de17a2c9eb564 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Tue, 30 Apr 2024 09:48:51 -0600
Subject: [PATCH 02/15] remove asv pin in asv-bench.yml

---
 build_envs/asv-bench.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_envs/asv-bench.yml b/build_envs/asv-bench.yml
index 742decfd..d1a017e1 100644
--- a/build_envs/asv-bench.yml
+++ b/build_envs/asv-bench.yml
@@ -3,6 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.10
+  - asv
   - cf_xarray
   - cftime
   - cython
@@ -18,5 +19,4 @@ dependencies:
   - xarray
   - xskillscore
   - pip:
-      - asv<0.6.2
       - -e ../

From c745e9976a50bc331750d9c8d8e91b195fd2598b Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Tue, 30 Apr 2024 10:24:08 -0600
Subject: [PATCH 03/15] roll back another version

---
 .github/workflows/asv-benchmarking.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 6cf70098..77b0f3c7 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -36,7 +36,7 @@ jobs:
         continue-on-error: true
         uses: mamba-org/setup-micromamba@v1
         with:
-          micromamba-version: "1.5.7-0"
+          micromamba-version: "1.5.6-0"
           environment-file: ./build_envs/asv-bench.yml
           cache-environment: true
           cache-environment-key: "benchmark-${{runner.os}}-${{runner.arch}}-${{env.TODAY}}"

From fa1ea303b01fbb27982b0dc3dece7a81e732a1c2 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Tue, 30 Apr 2024 10:45:03 -0600
Subject: [PATCH 04/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 77b0f3c7..8f8eb43a 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -32,23 +32,10 @@ jobs:
           echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - name: Set up conda environment
-        id: env-setup
-        continue-on-error: true
-        uses: mamba-org/setup-micromamba@v1
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          micromamba-version: "1.5.6-0"
+          miniconda-version: "24.1.2-0"
           environment-file: ./build_envs/asv-bench.yml
-          cache-environment: true
-          cache-environment-key: "benchmark-${{runner.os}}-${{runner.arch}}-${{env.TODAY}}"
-
-      - name: retry environment set up if failed
-        if: steps.env-setup.outcome == 'failure'
-        uses: mamba-org/setup-micromamba@v1
-        with:
-          download-micromamba: false
-          environment-file: ./build_envs/asv-bench.yml
-          cache-environment: true
-          cache-environment-key: "benchmark-${{runner.os}}-${{runner.arch}}-${{env.TODAY}}"
 
       - name: Copy existing results
         run: |

From 064fc97c88151066491b1a5c32c339238088884f Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Tue, 30 Apr 2024 10:56:47 -0600
Subject: [PATCH 05/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 8f8eb43a..6593e05d 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up conda environment
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniconda-version: "24.1.2-0"
+          conda-version: "24.1.2"
           environment-file: ./build_envs/asv-bench.yml
 
       - name: Copy existing results

From 004cc957b76a62359f0874d13c6bda620e3a6172 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 08:50:06 -0600
Subject: [PATCH 06/15] Set up env caching in asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 6593e05d..6b3dedaa 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -27,15 +27,27 @@ jobs:
           fetch-depth: 0
           ref: main
           path: geocat-comp-asv
-      - name: Set environment variables
-        run: |
-          echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+      - name: Cache conda
+        uses: actions/cache@v3
+        env:
+          # Increase this value to reset cache if etc/example-environment.yml has not changed
+          CACHE_NUMBER: 0
+        with:
+          path: ~/conda_pkgs_dir
+          key:
+            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
+            hashFiles('./build_envs/asv-bench.yml') }}
 
       - name: Set up conda environment
         uses: conda-incubator/setup-miniconda@v3
         with:
+          activate-environment: asv-bench
           conda-version: "24.1.2"
           environment-file: ./build_envs/asv-bench.yml
+          use-only-tar-bz2: true
+        run: conda info
+        run: conda list
 
       - name: Copy existing results
         run: |

From 624d518e09733b7541d18e45d605a4697049ba30 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 08:53:55 -0600
Subject: [PATCH 07/15] typo

---
 .github/workflows/asv-benchmarking.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 6b3dedaa..ef76cd78 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -46,8 +46,9 @@ jobs:
           conda-version: "24.1.2"
           environment-file: ./build_envs/asv-bench.yml
           use-only-tar-bz2: true
-        run: conda info
-        run: conda list
+        run: |
+          conda info
+          conda list
 
       - name: Copy existing results
         run: |

From 2599bbdb547cfa0a0cf2e08b916dc8cd384a5391 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 08:55:37 -0600
Subject: [PATCH 08/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index ef76cd78..f0d8ac05 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -46,7 +46,7 @@ jobs:
           conda-version: "24.1.2"
           environment-file: ./build_envs/asv-bench.yml
           use-only-tar-bz2: true
-        run: |
+      - run: |
           conda info
           conda list
 

From 06fc5a23de2d93ad7654e7078e342946829d4e26 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 09:06:06 -0600
Subject: [PATCH 09/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index f0d8ac05..eb5265c0 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -43,6 +43,7 @@ jobs:
         uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: asv-bench
+          channel-priority: strict
           conda-version: "24.1.2"
           environment-file: ./build_envs/asv-bench.yml
           use-only-tar-bz2: true

From 23f7e3d0ce36a74d4926d23fd4499e64c1ee4201 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 09:12:02 -0600
Subject: [PATCH 10/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index eb5265c0..6a8cfe6e 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -29,7 +29,7 @@ jobs:
           path: geocat-comp-asv
 
       - name: Cache conda
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           # Increase this value to reset cache if etc/example-environment.yml has not changed
           CACHE_NUMBER: 0
@@ -42,8 +42,6 @@ jobs:
       - name: Set up conda environment
         uses: conda-incubator/setup-miniconda@v3
         with:
-          activate-environment: asv-bench
-          channel-priority: strict
           conda-version: "24.1.2"
           environment-file: ./build_envs/asv-bench.yml
           use-only-tar-bz2: true

From c89e80f6e83a4f7c9d284bf9b6aff1aa855de35c Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 09:25:40 -0600
Subject: [PATCH 11/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 6a8cfe6e..c1d5cdf1 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Set up conda environment
         uses: conda-incubator/setup-miniconda@v3
         with:
-          conda-version: "24.1.2"
+          miniforge-version: "24.1.2"
           environment-file: ./build_envs/asv-bench.yml
           use-only-tar-bz2: true
       - run: |

From 766fc20e0711ecdd8be4a4e18f4a01e3b17058fb Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 09:27:26 -0600
Subject: [PATCH 12/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index c1d5cdf1..6be01ce2 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Set up conda environment
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-version: "24.1.2"
+          miniforge-version: "24.1.2-0"
           environment-file: ./build_envs/asv-bench.yml
           use-only-tar-bz2: true
       - run: |

From 5eefe20acc99872911fddecc8bc4ff2d53641eec Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 09:38:41 -0600
Subject: [PATCH 13/15] Update release-notes.rst

---
 docs/release-notes.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 3834f825..d6c55f43 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -16,6 +16,7 @@ Internal Changes
 ^^^^^^^^^^^^^^^^
 * Update and setup autoupdate for pre-commit hooks by `Cora Schneck`_ in (:pr:`604`)
 * Removed ``pre-commit.yaml`` action in favor of pre-commit.ci by `Cora Schneck`_ in (:pr:`608`)
+* Remove ASV version pin and pin Conda version for benchmarking workflow by `Katelyn FitzGerald`_ in (:pr:`610`)
 
 v2024.04.0 (April 23, 2024)
 ---------------------------

From a2865314323de2f2919b62d59a2b867bf205959b Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 10:09:52 -0600
Subject: [PATCH 14/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 43 ++++++++++++++++----------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 6be01ce2..42db3960 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -28,26 +28,35 @@ jobs:
           ref: main
           path: geocat-comp-asv
 
-      - name: Cache conda
-        uses: actions/cache@v4
-        env:
-          # Increase this value to reset cache if etc/example-environment.yml has not changed
-          CACHE_NUMBER: 0
-        with:
-          path: ~/conda_pkgs_dir
-          key:
-            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
-            hashFiles('./build_envs/asv-bench.yml') }}
-
-      - name: Set up conda environment
+      - name: Setup Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: "24.1.2-0"
-          environment-file: ./build_envs/asv-bench.yml
-          use-only-tar-bz2: true
-      - run: |
-          conda info
-          conda list
+          activate-environment: asv-bench
+
+      - name: Get date
+        id: get-date
+        run: echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Cache Conda env
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.CONDA }}/envs
+          key:
+            conda-${{ runner.os }}--${{ runner.arch }}--${{
+            steps.get-date.outputs.today }}-${{
+            hashFiles('./build_envs/asv-bench.yml') }}-${{ env.CACHE_NUMBER}}
+        env:
+          # Increase this value to reset cache if the environment file has not changed
+          CACHE_NUMBER: 0
+        id: cache
+
+      - name: Update environment
+        run:
+          conda env update -n asv-bench -f
+          ./build_envs/asv-bench.yml
+        if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Copy existing results
         run: |

From 874731a6fe6b0e87a5548d26b4df5aff5193fa76 Mon Sep 17 00:00:00 2001
From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com>
Date: Wed, 1 May 2024 10:15:35 -0600
Subject: [PATCH 15/15] Update asv-benchmarking.yml

---
 .github/workflows/asv-benchmarking.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml
index 42db3960..1d72895e 100644
--- a/.github/workflows/asv-benchmarking.yml
+++ b/.github/workflows/asv-benchmarking.yml
@@ -40,7 +40,7 @@ jobs:
         shell: bash
 
       - name: Cache Conda env
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.CONDA }}/envs
           key: