diff --git a/config/galaxy.ini.sample b/config/galaxy.ini.sample index a50baf8afb71..e334c9357a06 100644 --- a/config/galaxy.ini.sample +++ b/config/galaxy.ini.sample @@ -203,7 +203,8 @@ paste.app_factory = galaxy.web.buildapp:app_factory # Pass debug flag to conda commands. #conda_debug = False # conda channels to enable by default (http://conda.pydata.org/docs/custom-channels.html) -#conda_ensure_channels = conda-forge,r,bioconda,iuc +# the recommended channel order is the one from BioConda (https://github.com/bioconda/bioconda-recipes/blob/master/config.yml#L8) +#conda_ensure_channels = iuc,bioconda,r,defaults,conda-forge # Set to True to instruct Galaxy to look for and install missing tool # dependencies before each job runs. #conda_auto_install = False diff --git a/doc/source/admin/dependency_resolvers.rst b/doc/source/admin/dependency_resolvers.rst index 6ec8e9f6804d..56453540bfc4 100644 --- a/doc/source/admin/dependency_resolvers.rst +++ b/doc/source/admin/dependency_resolvers.rst @@ -182,7 +182,7 @@ debug ensure_channels conda channels to enable by default. See http://conda.pydata.org/docs/custom-channels.html for more - information about channels. (default: conda-forge,r,bioconda,iuc). + information about channels. (default: iuc,bioconda,r,defaults,conda-forge). auto_install Set to True to instruct Galaxy to look for and install missing tool diff --git a/lib/galaxy/tools/deps/resolvers/conda.py b/lib/galaxy/tools/deps/resolvers/conda.py index a21a37ebd4a9..b39185d1b84a 100644 --- a/lib/galaxy/tools/deps/resolvers/conda.py +++ b/lib/galaxy/tools/deps/resolvers/conda.py @@ -31,7 +31,7 @@ DEFAULT_BASE_PATH_DIRECTORY = "_conda" DEFAULT_CONDARC_OVERRIDE = "_condarc" -DEFAULT_ENSURE_CHANNELS = "conda-forge,r,bioconda,iuc" +DEFAULT_ENSURE_CHANNELS = "iuc,bioconda,r,defaults,conda-forge" log = logging.getLogger(__name__)