Skip to content

Commit

Permalink
MAINT: Do not pre-suppose conda-forge [mamba]
Browse files Browse the repository at this point in the history
  • Loading branch information
HaoZeke committed Feb 4, 2024
1 parent d6ab756 commit 007487a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Bug Fixes
- The ``mamba`` plugin works correctly for newer versions (>=1.5) of ``libmambapy`` (#1372)
- The ``mamba`` plugin respects the ``MAMBARC`` environment if set, taking
channels and channel priority from the file in the environment variable. (#1373)
- ``conda-forge`` is no longer a default channel for ``mamba``. (#1373)
- Fixed a bug where ``matrix`` requirements were dropped if an environment file was specified. (#1373)

Other Changes and Additions
Expand Down
2 changes: 0 additions & 2 deletions asv/plugins/mamba.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ def __init__(self, conf, python, requirements, tagged_env_vars):
self._requirements = requirements
self._mamba_channels = conf.conda_channels
self._mamba_environment_file = None
if "conda-forge" not in conf.conda_channels and not os.getenv("MAMBARC"):
self._mamba_channels += ["conda-forge"]

if conf.conda_environment_file == "IGNORE":
log.debug("Skipping environment file due to conda_environment_file set to IGNORE")
Expand Down
4 changes: 1 addition & 3 deletions docs/source/asv.conf.json.rst
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,7 @@ the project being benchmarked may specify in its ``setup.py`` file.
The ``mamba`` plugin will now take channels and channel priority from the
``MAMBARC`` environment variable if it is provided. e.g.
``MAMBARC=$HOME/.condarc asv run``. By default user ``.rc`` files are not
read to enforce isolation. The ``conda-forge`` channel is used as a
default only if neither an environment file nor the ``MAMBARC`` variable
is set.
read to enforce isolation.
The ``env`` and ``env_nobuild`` dictionaries can be used to set also
environment variables::
Expand Down

0 comments on commit 007487a

Please sign in to comment.