Skip to content

Commit 27bc430

Browse files
committed
MAINT: Do not pre-suppose conda-forge [mamba]
1 parent f9d3c24 commit 27bc430

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

CHANGES.rst

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Bug Fixes
1212
- The ``mamba`` plugin works correctly for newer versions (>=1.5) of ``libmambapy`` (#1372)
1313
- The ``mamba`` plugin respects the ``MAMBARC`` environment if set, taking
1414
channels and channel priority from the file in the environment variable. (#1373)
15+
- ``conda-forge`` is no longer a default channel for ``mamba``. (#1373)
1516
- Fixed a bug where ``matrix`` requirements were dropped if an environment file was specified. (#1373)
1617

1718
Other Changes and Additions

asv/plugins/mamba.py

-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def __init__(self, conf, python, requirements, tagged_env_vars):
5555
self._requirements = requirements
5656
self._mamba_channels = conf.conda_channels
5757
self._mamba_environment_file = None
58-
if "conda-forge" not in conf.conda_channels and not os.getenv("MAMBARC"):
59-
self._mamba_channels += ["conda-forge"]
6058

6159
if conf.conda_environment_file == "IGNORE":
6260
log.debug("Skipping environment file due to conda_environment_file set to IGNORE")

docs/source/asv.conf.json.rst

+1-3
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,7 @@ the project being benchmarked may specify in its ``setup.py`` file.
285285
The ``mamba`` plugin will now take channels and channel priority from the
286286
``MAMBARC`` environment variable if it is provided. e.g.
287287
``MAMBARC=$HOME/.condarc asv run``. By default user ``.rc`` files are not
288-
read to enforce isolation. The ``conda-forge`` channel is used as a
289-
default only if neither an environment file nor the ``MAMBARC`` variable
290-
is set.
288+
read to enforce isolation.
291289
292290
The ``env`` and ``env_nobuild`` dictionaries can be used to set also
293291
environment variables::

0 commit comments

Comments
 (0)