Skip to content

Fixes for CLI when external_galaxy is used as the engine#1072

Merged
jmchilton merged 2 commits intogalaxyproject:masterfrom
simonbray:external_galaxy-fixes
Sep 1, 2020
Merged

Fixes for CLI when external_galaxy is used as the engine#1072
jmchilton merged 2 commits intogalaxyproject:masterfrom
simonbray:external_galaxy-fixes

Conversation

@simonbray
Copy link
Member

Two minor changes:

  • when --galaxy_url is specified, the engine should be external_galaxy by default without this having to be additionally specified.
  • when tools/workflows are run on an external galaxy, planemo should not attempt to install shed repositories (at the very least, not by default). See planemo run fails with "Provided API key is not valid." #1071.


def _install_workflow(self, runnable):
if self._kwds.get("shed_install"):
if self._kwds.get("shed_install") and self._kwds.get("engine") != "external_galaxy":
Copy link
Member Author

@simonbray simonbray Aug 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe something like: (self._kwds.get("engine") != "external_galaxy" or self._kwds.get("galaxy_admin_key"))

so it would still be possible to run shed_install on an external galaxy instance, as long as the admin key was specified.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so it would still be possible to run shed_install on an external galaxy instance, as long as the admin key was specified.

I think this is an important use-case, e.g. for a Galaxy test server. Or a training instance that will be setup.

@jmchilton jmchilton merged commit 76337e3 into galaxyproject:master Sep 1, 2020
@jmchilton
Copy link
Member

Thanks for the fixes - these seem great!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants