From ea67fd63c0363449de3d4b4453797baeb8f42e8d Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Fri, 27 Oct 2023 15:24:02 -0400 Subject: [PATCH 1/5] Remove pinned asv version --- .github/workflows/asv-main.yml | 2 +- .github/workflows/asv-nightly.yml | 2 +- .github/workflows/asv-pr.yml | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/asv-main.yml b/.github/workflows/asv-main.yml index 0cc09df..897d956 100644 --- a/.github/workflows/asv-main.yml +++ b/.github/workflows/asv-main.yml @@ -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 virtualenv tabulate - name: Configure git run: | diff --git a/.github/workflows/asv-nightly.yml b/.github/workflows/asv-nightly.yml index ea42823..08ae9e0 100644 --- a/.github/workflows/asv-nightly.yml +++ b/.github/workflows/asv-nightly.yml @@ -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 virtualenv - name: Create ASV machine config file run: asv machine --machine gh-runner --yes diff --git a/.github/workflows/asv-pr.yml b/.github/workflows/asv-pr.yml index 9bcbfc4..89a1caf 100644 --- a/.github/workflows/asv-pr.yml +++ b/.github/workflows/asv-pr.yml @@ -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 virtualenv tabulate lf-asv-formatter - name: Get current job logs URL uses: Tiryoh/gha-jobid-action@v0 diff --git a/pyproject.toml b/pyproject.toml index 1ff2884..30a7939 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dev = [ "ipython", # Also used in building notebooks into Sphinx "matplotlib", # Used in sample notebook intro_notebook.ipynb "numpy", # Used in sample notebook intro_notebook.ipynb - "asv==0.5.1", # Used to compute performance benchmarks + "asv", # Used to compute performance benchmarks ] [build-system] From d06995a14b8fc7d5bdbcbdfd70e739c97170538b Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Fri, 27 Oct 2023 15:32:50 -0400 Subject: [PATCH 2/5] Add verbose flag --- .github/workflows/asv-main.yml | 2 +- .github/workflows/asv-nightly.yml | 4 ++-- .github/workflows/asv-pr.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/asv-main.yml b/.github/workflows/asv-main.yml index 897d956..b3838c5 100644 --- a/.github/workflows/asv-main.yml +++ b/.github/workflows/asv-main.yml @@ -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/.github/workflows/asv-nightly.yml b/.github/workflows/asv-nightly.yml index 08ae9e0..0d9d568 100644 --- a/.github/workflows/asv-nightly.yml +++ b/.github/workflows/asv-nightly.yml @@ -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/.github/workflows/asv-pr.yml b/.github/workflows/asv-pr.yml index 89a1caf..a3c0535 100644 --- a/.github/workflows/asv-pr.yml +++ b/.github/workflows/asv-pr.yml @@ -77,8 +77,8 @@ jobs: run: | git remote add upstream https://github.com/${{ github.repository }}.git git fetch upstream - asv continuous upstream/main HEAD || true - asv compare upstream/main HEAD --sort ratio | tee output + asv continuous upstream/main HEAD --verbose || true + asv compare upstream/main HEAD --sort ratio --verbose | tee output python -m lf_asv_formatter printf "\n\nClick [here]($STEP_URL) to view all benchmarks." >> output env: From 8110f9f74a714a807867479993593bd9f326e1c5 Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Fri, 27 Oct 2023 15:40:00 -0400 Subject: [PATCH 3/5] Install asv formatter from custom branch --- .github/workflows/asv-pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/asv-pr.yml b/.github/workflows/asv-pr.yml index a3c0535..28e56cd 100644 --- a/.github/workflows/asv-pr.yml +++ b/.github/workflows/asv-pr.yml @@ -61,7 +61,8 @@ jobs: run: | sudo apt-get update python -m pip install --upgrade pip - pip install asv virtualenv tabulate lf-asv-formatter + pip install asv virtualenv tabulate + pip install git+https://github.com/lincc-frameworks/asv-formatter.git@issue/6/new-output-formats - name: Get current job logs URL uses: Tiryoh/gha-jobid-action@v0 From 26cf4bb17075b5519da1ad1d0f74eb6ed2e58268 Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Mon, 30 Oct 2023 22:22:34 -0400 Subject: [PATCH 4/5] Call formatter with installed asv version --- .github/workflows/asv-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/asv-pr.yml b/.github/workflows/asv-pr.yml index 28e56cd..5306700 100644 --- a/.github/workflows/asv-pr.yml +++ b/.github/workflows/asv-pr.yml @@ -1,6 +1,6 @@ # This workflow will run benchmarks with airspeed velocity (asv) for pull requests. # It will compare the performance of the main branch with the performance of the merge -# with the new changes and publish a comment with this assessment. +# with the new changes and publish a comment with this assessment. name: Run ASV benchmarks for PR @@ -80,7 +80,7 @@ jobs: git fetch upstream asv continuous upstream/main HEAD --verbose || true asv compare upstream/main HEAD --sort ratio --verbose | tee output - python -m lf_asv_formatter + python -m lf_asv_formatter --asv_version "$(echo asv --version)" printf "\n\nClick [here]($STEP_URL) to view all benchmarks." >> output env: STEP_URL: "${{ steps.jobs.outputs.html_url }}#step:8:1" From 9ec4749406e6bf70ba78378fc149059d26493b94 Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Tue, 31 Oct 2023 15:45:57 -0400 Subject: [PATCH 5/5] Revert to installing asv-formatter using pypi --- .github/workflows/asv-main.yml | 2 +- .github/workflows/asv-nightly.yml | 2 +- .github/workflows/asv-pr.yml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/asv-main.yml b/.github/workflows/asv-main.yml index b3838c5..e280bd0 100644 --- a/.github/workflows/asv-main.yml +++ b/.github/workflows/asv-main.yml @@ -66,7 +66,7 @@ jobs: run: | sudo apt-get update python -m pip install --upgrade pip - pip install asv virtualenv tabulate + pip install asv==0.6.1 virtualenv tabulate - name: Configure git run: | diff --git a/.github/workflows/asv-nightly.yml b/.github/workflows/asv-nightly.yml index 0d9d568..5b4d6a8 100644 --- a/.github/workflows/asv-nightly.yml +++ b/.github/workflows/asv-nightly.yml @@ -43,7 +43,7 @@ jobs: run: | sudo apt-get update python -m pip install --upgrade pip - pip install asv virtualenv + pip install asv==0.6.1 virtualenv - name: Create ASV machine config file run: asv machine --machine gh-runner --yes diff --git a/.github/workflows/asv-pr.yml b/.github/workflows/asv-pr.yml index 5306700..a8fd18e 100644 --- a/.github/workflows/asv-pr.yml +++ b/.github/workflows/asv-pr.yml @@ -61,8 +61,7 @@ jobs: run: | sudo apt-get update python -m pip install --upgrade pip - pip install asv virtualenv tabulate - pip install git+https://github.com/lincc-frameworks/asv-formatter.git@issue/6/new-output-formats + pip install asv==0.6.1 virtualenv tabulate lf-asv-formatter - name: Get current job logs URL uses: Tiryoh/gha-jobid-action@v0