From 136046a609f0002a45eadee59029a3eb596b62d3 Mon Sep 17 00:00:00 2001 From: Mark Campanelli Date: Fri, 10 Jan 2025 09:49:11 -0700 Subject: [PATCH 1/3] Pin asv to latest to fix conda install breakage --- .github/workflows/asv_check.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index e72896be08..3dc7646c28 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -26,19 +26,7 @@ jobs: python-version: '3.9' - name: Install asv - run: pip install asv==0.4.2 - - # asv 0.4.2 (and more recent versions as well) creates conda envs - # using the --force option, which was removed in conda 24.3. - # Since ubuntu-latest now comes with conda 24.3 pre-installed, - # using the system's conda will result in error. - # To prevent that, we install an older version. - # TODO: remove this when we eventually upgrade our asv version. - # https://github.com/airspeed-velocity/asv/issues/1396 - - name: Install Conda - uses: conda-incubator/setup-miniconda@v3 - with: - conda-version: 24.1.2 + run: pip install asv==0.6.4 - name: Run asv benchmarks run: | From 582386ea8b2ed1244ce716c38462fd62c23dd1a9 Mon Sep 17 00:00:00 2001 From: Mark Campanelli Date: Fri, 10 Jan 2025 09:54:58 -0700 Subject: [PATCH 2/3] Update whatsnew --- docs/sphinx/source/whatsnew/v0.11.3.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index 238ec1e9a6..0cb6f4770e 100644 --- a/docs/sphinx/source/whatsnew/v0.11.3.rst +++ b/docs/sphinx/source/whatsnew/v0.11.3.rst @@ -22,9 +22,12 @@ Testing Requirements ~~~~~~~~~~~~ +* asv 0.4.2 upgraded to asv 0.6.4 to fix CI install failure due to pinned older conda. + (pull:`2352`) Contributors ~~~~~~~~~~~~ +* Mark Campanellli (:ghuser:`markcampanelli`) From 94a59dc490b9961d10985d9735f469e2ed13da35 Mon Sep 17 00:00:00 2001 From: Mark Campanelli Date: Fri, 10 Jan 2025 12:44:37 -0700 Subject: [PATCH 3/3] Address reviewer comments --- docs/sphinx/source/whatsnew/v0.11.3.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index 0cb6f4770e..fa9d4026cc 100644 --- a/docs/sphinx/source/whatsnew/v0.11.3.rst +++ b/docs/sphinx/source/whatsnew/v0.11.3.rst @@ -22,12 +22,14 @@ Testing Requirements ~~~~~~~~~~~~ -* asv 0.4.2 upgraded to asv 0.6.4 to fix CI install failure due to pinned older conda. + + +Maintenance +~~~~~~~~~~~ +* asv 0.4.2 upgraded to asv 0.6.4 to fix CI failure due to pinned older conda. (pull:`2352`) Contributors ~~~~~~~~~~~~ -* Mark Campanellli (:ghuser:`markcampanelli`) - - +* Mark Campanelli (:ghuser:`markcampanelli`)