diff --git a/benchmarks/asv_delegated_conda.py b/benchmarks/asv_delegated_conda.py index 7d8b6e109c..d53c111ab9 100644 --- a/benchmarks/asv_delegated_conda.py +++ b/benchmarks/asv_delegated_conda.py @@ -192,6 +192,11 @@ def copy_asv_files(src_parent: Path, dst_parent: Path) -> None: # Record new environment information in properties. self._update_info() + def _run_conda(self, args, env=None): + # TODO: remove after airspeed-velocity/asv#1397 is merged and released. + args = ["--yes" if arg == "--force" else arg for arg in args] + return super()._run_conda(args, env) + def checkout_project(self, repo: Repo, commit_hash: str) -> None: """Check out the working tree of the project at given commit hash.""" super().checkout_project(repo, commit_hash) diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst index 00e6220c28..448b528c38 100644 --- a/docs/src/whatsnew/latest.rst +++ b/docs/src/whatsnew/latest.rst @@ -90,6 +90,10 @@ This document explains the changes made to Iris for this release #. `@bouweandela`_ removed a workaround in :meth:`~iris.cube.CubeList.merge` for an issue with :func:`dask.array.stack` which has been solved since 2017. (:pull:`5923`) +#. `@trexfeathers`_ introduced a temporary fix for Airspeed Velocity's + deprecated use of the ``conda --force`` argument. To be removed once + `airspeed-velocity/asv#1397`_ is merged and released. (:pull:`5931`) + .. comment Whatsnew author names (@github name) in alphabetical order. Note that, @@ -100,3 +104,5 @@ This document explains the changes made to Iris for this release .. comment Whatsnew resources in alphabetical order: + +.. _airspeed-velocity/asv#1397: https://github.com/airspeed-velocity/asv/pull/1397