From 05183a3c8063ca7e5cb92dacddb080df85ac05f2 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 20 Feb 2017 15:12:42 -0500 Subject: [PATCH] Implement a --no_dependency_resolution option. As requested by @mvdbeek https://github.com/galaxyproject/planemo/issues/633. Prior to the latest release of Planemo Conda would only be enabled with --conda_dependency_resolution despite being on by default in Galaxy. Fixes #633. --- planemo/galaxy/config.py | 4 ++++ planemo/options.py | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/planemo/galaxy/config.py b/planemo/galaxy/config.py index 52c90ad1c..0cd21a0d6 100644 --- a/planemo/galaxy/config.py +++ b/planemo/galaxy/config.py @@ -102,6 +102,9 @@ """ +NO_DEPENDENCY_RESOLUTION_CONF = """ + +""" BREW_DEPENDENCY_RESOLUTION_CONF = """ @@ -208,6 +211,7 @@ class = StreamHandler "brew_dependency_resolution": BREW_DEPENDENCY_RESOLUTION_CONF, "shed_dependency_resolution": SHED_DEPENDENCY_RESOLUTION_CONF, "conda_dependency_resolution": CONDA_DEPENDENCY_RESOLUTION_CONF, + "no_dependency_resolution": NO_DEPENDENCY_RESOLUTION_CONF, "default_dependency_resolution": DEFAULT_DEPENDENCY_RESOLUTION_CONF, } diff --git a/planemo/options.py b/planemo/options.py index cb543e281..44066178f 100644 --- a/planemo/options.py +++ b/planemo/options.py @@ -236,6 +236,14 @@ def cwl_conformance_test(): ) +def no_dependency_resolution(): + return planemo_option( + "--no_dependency_resolution", + is_flag=True, + help="Configure Galaxy with no dependency resolvers.", + ) + + def brew_dependency_resolution(): return planemo_option( "--brew_dependency_resolution", @@ -890,6 +898,7 @@ def galaxy_config_options(): dependency_resolvers_option(), brew_dependency_resolution(), shed_dependency_resolution(), + no_dependency_resolution(), conda_target_options(), conda_dependency_resolution(), conda_copy_dependencies_option(),