Fix bioconda support by adding conda-forge to default conda channels.

xref galaxyproject/galaxy#3023
galaxyproject · Oct 8, 2016 · 2487256 · 2487256
1 parent 1f23662
commit 2487256
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/galaxy/tools/deps/__init__.py b/galaxy/tools/deps/__init__.py
@@ -8,7 +8,7 @@
 from galaxy.util import plugin_config
 
 from .resolvers import NullDependency
-from .resolvers.conda import CondaDependencyResolver
+from .resolvers.conda import CondaDependencyResolver, DEFAULT_ENSURE_CHANNELS
 from .resolvers.galaxy_packages import GalaxyPackageDependencyResolver
 from .resolvers.tool_shed_packages import ToolShedPackageDependencyResolver
 
@@ -21,7 +21,7 @@
     'conda_prefix': None,
     'conda_exec': None,
     'conda_debug': None,
-    'conda_ensure_channels': 'r,bioconda,iuc',
+    'conda_ensure_channels': DEFAULT_ENSURE_CHANNELS,
     'conda_auto_install': False,
     'conda_auto_init': False,
 }

diff --git a/galaxy/tools/deps/resolvers/conda.py b/galaxy/tools/deps/resolvers/conda.py
@@ -30,7 +30,7 @@
 
 DEFAULT_BASE_PATH_DIRECTORY = "_conda"
 DEFAULT_CONDARC_OVERRIDE = "_condarc"
-DEFAULT_ENSURE_CHANNELS = "r,bioconda,iuc"
+DEFAULT_ENSURE_CHANNELS = "conda-forge,r,bioconda,iuc"
 
 log = logging.getLogger(__name__)