From 57ff38786c0aff9be3e8055c139136fdd8e88d30 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Wed, 1 May 2024 19:55:20 -0600 Subject: [PATCH 1/3] Update 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 d1a017e1..8a78ed43 100644 --- a/build_envs/asv-bench.yml +++ b/build_envs/asv-bench.yml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - python=3.10 - - asv + - asv<0.6.2 - cf_xarray - cftime - cython From d9d3d7b440bfff753d8e15727dc463027fcf4768 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Fri, 3 May 2024 11:14:26 -0600 Subject: [PATCH 2/3] Update asv-benchmarking.yml --- .github/workflows/asv-benchmarking.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/asv-benchmarking.yml b/.github/workflows/asv-benchmarking.yml index 1d72895e..0ef4b9e8 100644 --- a/.github/workflows/asv-benchmarking.yml +++ b/.github/workflows/asv-benchmarking.yml @@ -9,6 +9,9 @@ on: jobs: benchmark: runs-on: ubuntu-latest + defaults: + run: + shell: bash -el {0} env: CONDA_ENV_FILE: ./build_envs/asv-bench.yml ASV_DIR: ./benchmarks @@ -39,7 +42,7 @@ jobs: run: echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT shell: bash - - name: Cache Conda env + - name: Cache environment uses: actions/cache@v4 with: path: ${{ env.CONDA }}/envs @@ -58,6 +61,11 @@ jobs: ./build_envs/asv-bench.yml if: steps.cache.outputs.cache-hit != 'true' + - name: Conda list + run: | + conda info + conda list + - name: Copy existing results run: | if [ -d "geocat-comp-asv/results" ]; then @@ -65,7 +73,6 @@ jobs: fi - name: Run benchmarks - shell: bash -l {0} id: benchmark run: | cd benchmarks From ec543956fdeb7b924e974db91d431e625498fe3b Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Fri, 3 May 2024 11:25:15 -0600 Subject: [PATCH 3/3] 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 936daf92..6d62ea03 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -18,6 +18,7 @@ Internal Changes * 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`) * Updates to issue and PR templates by `Anissa Zacharias`_ in (:pr:`612`) +* Re-pin ASV and list env info by `Katelyn FitzGerald`_ in (:pr:`613`) v2024.04.0 (April 23, 2024) ---------------------------