From feee80860fad4ef21b1924300f095ec9c240bae5 Mon Sep 17 00:00:00 2001
From: Marc Garcia <garcia.marc@gmail.com>
Date: Sun, 3 Apr 2022 03:37:24 +0100
Subject: [PATCH 1/2] CI: Simplify call to asv (#46599)

---
 .github/workflows/code-checks.yml | 14 ++------------
 environment.yml                   |  2 +-
 requirements-dev.txt              |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index 59fb81b167bd4..efd9e500d6732 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -140,22 +140,12 @@ jobs:
     - name: Run ASV benchmarks
       run: |
         cd asv_bench
-        asv check -E existing
-        git remote add upstream https://github.com/pandas-dev/pandas.git
-        git fetch upstream
         asv machine --yes
-        asv dev | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log
+        # TODO add `--durations` when we start using asv >= 0.5 (#46598)
+        asv run --quick --dry-run --python=same | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log
         if grep "failed" benchmarks.log > /dev/null ; then
             exit 1
         fi
-      if: ${{ steps.build.outcome == 'success' }}
-
-    - name: Publish benchmarks artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: Benchmarks log
-        path: asv_bench/benchmarks.log
-      if: failure()
 
   build_docker_dev_environment:
     name: Build Docker Dev Environment
diff --git a/environment.yml b/environment.yml
index a90f28a2c9e16..0fbfb8236a135 100644
--- a/environment.yml
+++ b/environment.yml
@@ -9,7 +9,7 @@ dependencies:
   - pytz
 
   # benchmarks
-  - asv < 0.5.0  # 2022-02-08: v0.5.0 > leads to ASV checks running > 3 hours on CI
+  - asv
 
   # building
   # The compiler packages are meta-packages and install the correct compiler (activation) packages on the respective platforms.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index bb6c5d9427d38..5ede7b99a3d22 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,7 +4,7 @@
 numpy>=1.18.5
 python-dateutil>=2.8.1
 pytz
-asv < 0.5.0
+asv
 cython>=0.29.24
 black==22.3.0
 cpplint

From c061dcc7193074b8669791f7db050315af839d75 Mon Sep 17 00:00:00 2001
From: Marc Garcia <garcia.marc@gmail.com>
Date: Tue, 5 Apr 2022 11:22:32 +0100
Subject: [PATCH 2/2] CI: Remove grep from asv call (using strict parameter
 instead) (#46633)

(cherry picked from commit c8cbe1936d21503e82c6a9efeb133acaff4f845a)
---
 .github/workflows/code-checks.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index efd9e500d6732..87b80204d0c19 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -141,11 +141,7 @@ jobs:
       run: |
         cd asv_bench
         asv machine --yes
-        # TODO add `--durations` when we start using asv >= 0.5 (#46598)
-        asv run --quick --dry-run --python=same | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log
-        if grep "failed" benchmarks.log > /dev/null ; then
-            exit 1
-        fi
+        asv run --quick --dry-run --strict --durations=30 --python=same
 
   build_docker_dev_environment:
     name: Build Docker Dev Environment