Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.07] Fix for bioconda recipes depending on conda-forge. #3023

Merged
merged 1 commit into from
Oct 10, 2016
Merged

[16.07] Fix for bioconda recipes depending on conda-forge. #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/galaxy.ini.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ 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 = r,bioconda,iuc
#conda_ensure_channels = conda-forge,r,bioconda,iuc
# Set to True to instruct Galaxy to look for and install missing tool
# dependencies before each job runs.
#conda_auto_install = False
Expand Down
2 changes: 1 addition & 1 deletion doc/source/admin/dependency_resolvers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: r,bioconda).
information about channels. (default: conda-forge,r,bioconda,iuc).

auto_install
Set to True to instruct Galaxy to look for and install missing tool
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/tools/deps/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'conda_prefix': None,
'conda_exec': None,
'conda_debug': None,
'conda_ensure_channels': 'r,bioconda,iuc',
'conda_ensure_channels': 'conda-forge,r,bioconda,iuc',
'conda_auto_install': False,
'conda_auto_init': False,
'conda_copy_dependencies': False,
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/tools/deps/resolvers/conda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

DEFAULT_BASE_PATH_DIRECTORY = "_conda"
DEFAULT_CONDARC_OVERRIDE = "_condarc"
DEFAULT_ENSURE_CHANNELS = "r,bioconda,iuc"
DEFAULT_ENSURE_CHANNELS = "conda-forge,r,bioconda,iuc"

import logging
log = logging.getLogger(__name__)
Expand Down