diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index 57101a4e65f8..1d06d07f3be2 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -433,7 +433,7 @@ :Description: conda channels to enable by default (https://conda.io/docs/user-guide/tasks/manage-channels.html) -:Default: ``iuc,conda-forge,bioconda,defaults`` +:Default: ``conda-forge,bioconda,defaults`` :Type: str diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index ac4d64b02ee1..3f8bf9f908f7 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -316,7 +316,7 @@ galaxy: # conda channels to enable by default # (https://conda.io/docs/user-guide/tasks/manage-channels.html) - #conda_ensure_channels: iuc,conda-forge,bioconda,defaults + #conda_ensure_channels: conda-forge,bioconda,defaults # Use locally-built conda packages. #conda_use_local: false diff --git a/lib/galaxy/tool_util/deps/resolvers/conda.py b/lib/galaxy/tool_util/deps/resolvers/conda.py index 6c03873d6906..48877ff2ab9a 100644 --- a/lib/galaxy/tool_util/deps/resolvers/conda.py +++ b/lib/galaxy/tool_util/deps/resolvers/conda.py @@ -39,9 +39,8 @@ DEFAULT_BASE_PATH_DIRECTORY = "_conda" 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 , but -# adding `iuc` as first channel (for Galaxy-specific packages) -DEFAULT_ENSURE_CHANNELS = "iuc,conda-forge,bioconda,defaults" +# https://github.com/bioconda/bioconda-recipes/blob/master/config.yml +DEFAULT_ENSURE_CHANNELS = "conda-forge,bioconda,defaults" CONDA_SOURCE_CMD = """[ "$(basename "$CONDA_DEFAULT_ENV")" = "$(basename '{environment_path}')" ] || {{ MAX_TRIES=3 COUNT=0 diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml index a80ac907741f..ad282d375596 100644 --- a/lib/galaxy/webapps/galaxy/config_schema.yml +++ b/lib/galaxy/webapps/galaxy/config_schema.yml @@ -329,7 +329,7 @@ mapping: conda_ensure_channels: type: str - default: iuc,conda-forge,bioconda,defaults + default: conda-forge,bioconda,defaults required: false desc: | conda channels to enable by default