From bb2231a9ea6f7ae65b0ed7b10c6403878e498318 Mon Sep 17 00:00:00 2001
From: Sandro Campos <scampos@andrew.cmu.edu>
Date: Mon, 30 Oct 2023 22:47:54 -0400
Subject: [PATCH] Upgrade asv version

---
 ... if include_benchmarks %}asv-main.yml{% endif %}.jinja | 4 ++--
 ... include_benchmarks %}asv-nightly.yml{% endif %}.jinja | 6 +++---
 ...{% if include_benchmarks %}asv-pr.yml{% endif %}.jinja | 8 ++++----
 python-project-template/pyproject.toml.jinja              | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/python-project-template/.github/workflows/{% if include_benchmarks %}asv-main.yml{% endif %}.jinja b/python-project-template/.github/workflows/{% if include_benchmarks %}asv-main.yml{% endif %}.jinja
index 291aca04..fb093e0f 100644
--- a/python-project-template/.github/workflows/{% if include_benchmarks %}asv-main.yml{% endif %}.jinja	
+++ b/python-project-template/.github/workflows/{% if include_benchmarks %}asv-main.yml{% endif %}.jinja	
@@ -66,7 +66,7 @@ jobs:
         run: |
           sudo apt-get update
           python -m pip install --upgrade pip
-          pip install asv==0.5.1 virtualenv tabulate
+          pip install asv==0.6.1 virtualenv tabulate
 
       - name: Configure git
         run: |
@@ -86,7 +86,7 @@ jobs:
           fi
 
       - name: Run ASV for the main branch
-        run: asv run ALL --skip-existing
+        run: asv run ALL --skip-existing --verbose
 
       - name: Submit new results to the "benchmarks" branch
         uses: JamesIves/github-pages-deploy-action@v4
diff --git a/python-project-template/.github/workflows/{% if include_benchmarks %}asv-nightly.yml{% endif %}.jinja b/python-project-template/.github/workflows/{% if include_benchmarks %}asv-nightly.yml{% endif %}.jinja
index 7dd54420..d410d857 100644
--- a/python-project-template/.github/workflows/{% if include_benchmarks %}asv-nightly.yml{% endif %}.jinja	
+++ b/python-project-template/.github/workflows/{% if include_benchmarks %}asv-nightly.yml{% endif %}.jinja	
@@ -43,7 +43,7 @@ jobs:
         run: |
           sudo apt-get update
           python -m pip install --upgrade pip
-          pip install asv==0.5.1 virtualenv
+          pip install asv==0.6.1 virtualenv
 
       - name: Create ASV machine config file
         run: asv machine --machine gh-runner --yes
@@ -67,8 +67,8 @@ jobs:
 
           if [ -f $HASH_FILE ]; then          
             PREV_HASH=$(cat $HASH_FILE)
-            asv continuous $PREV_HASH $CURRENT_HASH || true
-            asv compare $PREV_HASH $CURRENT_HASH --sort ratio
+            asv continuous $PREV_HASH $CURRENT_HASH --verbose || true
+            asv compare $PREV_HASH $CURRENT_HASH --sort ratio --verbose
           fi
 
           echo $CURRENT_HASH > $HASH_FILE
diff --git a/python-project-template/.github/workflows/{% if include_benchmarks %}asv-pr.yml{% endif %}.jinja b/python-project-template/.github/workflows/{% if include_benchmarks %}asv-pr.yml{% endif %}.jinja
index e9c529f8..02127dcb 100644
--- a/python-project-template/.github/workflows/{% if include_benchmarks %}asv-pr.yml{% endif %}.jinja	
+++ b/python-project-template/.github/workflows/{% if include_benchmarks %}asv-pr.yml{% endif %}.jinja	
@@ -61,7 +61,7 @@ jobs:
         run: |
           sudo apt-get update
           python -m pip install --upgrade pip
-          pip install asv==0.5.1 virtualenv tabulate lf-asv-formatter
+          pip install asv==0.6.1 virtualenv tabulate lf-asv-formatter
 
       - name: Get current job logs URL
         uses: Tiryoh/gha-jobid-action@v0
@@ -77,9 +77,9 @@ jobs:
         run: |
           git remote add upstream https://github.com/{% raw %}${{ github.repository }}{% endraw %}.git
           git fetch upstream
-          asv continuous upstream/main HEAD || true
-          asv compare upstream/main HEAD --sort ratio | tee output
-          python -m lf_asv_formatter
+          asv continuous upstream/main HEAD --verbose || true
+          asv compare upstream/main HEAD --sort ratio --verbose | tee output
+          python -m lf_asv_formatter --asv_version "$(echo asv --version)"
           printf "\n\nClick [here]($STEP_URL) to view all benchmarks." >> output
         env:
           STEP_URL: "{% raw %}${{ steps.jobs.outputs.html_url }}{% endraw %}#step:8:1"
diff --git a/python-project-template/pyproject.toml.jinja b/python-project-template/pyproject.toml.jinja
index 9ad54149..5edc6ffc 100644
--- a/python-project-template/pyproject.toml.jinja
+++ b/python-project-template/pyproject.toml.jinja
@@ -54,7 +54,7 @@ dev = [
     "numpy", # Used in sample notebook intro_notebook.ipynb
 {%- endif %}
 {%- if include_benchmarks %}
-    "asv==0.5.1", # Used to compute performance benchmarks
+    "asv==0.6.1", # Used to compute performance benchmarks
 {%- endif %}
 ]