Remove conda defaults channel from more places

galaxyproject · Sep 2, 2024 · c778a2a · c778a2a
1 parent c15417c
commit c778a2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/doc/source/admin/dependency_resolvers.rst b/doc/source/admin/dependency_resolvers.rst
@@ -207,7 +207,7 @@ debug
 ensure_channels
     Conda channels to enable by default. See https://conda.io/docs/user-guide/tasks/manage-channels.html for more
     information about channels. This defaults to the value of the global ``conda_ensure_channels`` option or
-    ``iuc,conda-forge,bioconda,defaults`` otherwise.  This order should be consistent with the `Bioconda prescribed
+    ``conda-forge,bioconda`` otherwise.  This order should be consistent with the `Bioconda prescribed
     order <https://github.com/bioconda/bioconda-recipes/blob/master/config.yml>`__ if it includes ``bioconda``.
 
 auto_install

diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
@@ -477,7 +477,7 @@
 :Description:
     conda channels to enable by default
     (https://conda.io/docs/user-guide/tasks/manage-channels.html)
-:Default: ``conda-forge,bioconda,defaults``
+:Default: ``conda-forge,bioconda``
 :Type: str
 
 

diff --git a/lib/galaxy/tool_util/deps/resolvers/conda.py b/lib/galaxy/tool_util/deps/resolvers/conda.py
@@ -45,7 +45,7 @@
 DEFAULT_CONDARC_OVERRIDE = "_condarc"
 # Conda channel order from highest to lowest, following the one used in
 # https://github.com/bioconda/bioconda-recipes/blob/master/config.yml
-DEFAULT_ENSURE_CHANNELS = "conda-forge,bioconda,defaults"
+DEFAULT_ENSURE_CHANNELS = "conda-forge,bioconda"
 CONDA_SOURCE_CMD = """[ "$(basename "$CONDA_DEFAULT_ENV")" = "$(basename '{environment_path}')" ] || {{
 MAX_TRIES=3
 COUNT=0