Skip to content

[17.05] Backport #4409#4731

Merged
jmchilton merged 3 commits intogalaxyproject:release_17.05from
nsoranzo:release_17.05_backport_4409
Oct 2, 2017
Merged

[17.05] Backport #4409#4731
jmchilton merged 3 commits intogalaxyproject:release_17.05from
nsoranzo:release_17.05_backport_4409

Conversation

@nsoranzo
Copy link
Member

@nsoranzo nsoranzo commented Oct 2, 2017

Backport of #4409 to:

  • update conda channel order
  • override channel list on the command line instead of modifying condarc.

xref. galaxyproject/tools-iuc#1490

and make conda_context argument mandatory in functions/methods.
This should help making sure the correct context (e.g. channels)
is used for all Conda operations.

Also remove unused is_target_available() function.

Conflicts:
	lib/galaxy/tools/deps/conda_util.py
The way we were modifying condarc in the ensure_channels_configured()
method was broken because we were appending the missing channels at the
end, so the final order may not be the one specified in
conda_ensure_channels .

Also:
- not modifying the user condarc is a much better approach
- overriding the channel list on the command line will make debugging
  easier
@natefoo
Copy link
Member

natefoo commented Oct 2, 2017

👍

@jmchilton jmchilton merged commit 81ece25 into galaxyproject:release_17.05 Oct 2, 2017
@nsoranzo nsoranzo deleted the release_17.05_backport_4409 branch October 2, 2017 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants