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: | diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index afab58dd74..50b2786dae 100644 --- a/docs/sphinx/source/whatsnew/v0.11.3.rst +++ b/docs/sphinx/source/whatsnew/v0.11.3.rst @@ -28,6 +28,8 @@ Maintenance ~~~~~~~~~~~ * Fix ReadTheDocs builds by upgrading `readthedocs.yml` configuration (:issue:`2357`, :pull:`2358`) +* asv 0.4.2 upgraded to asv 0.6.4 to fix CI failure due to pinned older conda. + (pull:`2352`) Contributors @@ -35,3 +37,4 @@ Contributors * Rajiv Daxini (:ghuser:`RDaxini`) +* Mark Campanelli (:ghuser:`markcampanelli`)