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

Remove IUC conda channel from default configuration #10608

Merged
merged 1 commit into from
Nov 18, 2020
Merged

Remove IUC conda channel from default configuration #10608

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 doc/source/admin/galaxy_options.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/config/sample/galaxy.yml.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions lib/galaxy/tool_util/deps/resolvers/conda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/webapps/galaxy/config_schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down