Rename overly long --shed_brew_dependency_resolution option...

... to --shed_dependency_resolution.
galaxyproject · Jan 12, 2015 · ea02cea · ea02cea
1 parent 12fda29
commit ea02cea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/docs/commands/test.rst b/docs/commands/test.rst
@@ -59,8 +59,7 @@ please careful and do not try this against production Galaxy instances.
                                       Tool dependency dir for Galaxy to target.
       --brew_dependency_resolution    Configure Galaxy to use plain brew
                                       dependency resolution.
-      --shed_brew_dependency_resolution
-                                      Configure Galaxy to use brewed Tool Shed
+      --shed_dependency_resolution    Configure Galaxy to use brewed Tool Shed
                                       dependency resolution.
       --help                          Show this message and exit.
     
diff --git a/planemo/commands/cmd_test.py b/planemo/commands/cmd_test.py
@@ -81,7 +81,7 @@
 @options.job_config_option()
 @options.tool_dependency_dir_option()
 @options.brew_dependency_resolution()
-@options.shed_brew_dependency_resolution()
+@options.shed_dependency_resolution()
 @pass_context
 def cli(ctx, path, **kwds):
     """Run the tests in the specified tool tests in a Galaxy instance.

diff --git a/planemo/galaxy_config.py b/planemo/galaxy_config.py
@@ -54,15 +54,15 @@
 </dependency_resolvers>
 """
 
-SHED_BREW_DEPENDENCY_RESOLUTION_CONF = """<dependency_resolvers>
+SHED_DEPENDENCY_RESOLUTION_CONF = """<dependency_resolvers>
   <tool_shed_tap />
 </dependency_resolvers>
 """
 
 # Provide some shortcuts for simple/common dependency resolutions strategies.
 STOCK_DEPENDENCY_RESOLUTION_STRATEGIES = {
     "brew_dependency_resolution": BREW_DEPENDENCY_RESOLUTION_CONF,
-    "shed_brew_dependency_resolution": SHED_BREW_DEPENDENCY_RESOLUTION_CONF,
+    "shed_dependency_resolution": SHED_DEPENDENCY_RESOLUTION_CONF,
 }
 
 EMPTY_TOOL_CONF_TEMPLATE = """<toolbox></toolbox>"""
@@ -310,7 +310,7 @@ def __handle_dependency_resolution(config_directory, kwds):
     resolutions_strategies = [
         "brew_dependency_resolution",
         "dependency_resolvers_config_file",
-        "shed_brew_dependency_resolution",
+        "shed_dependency_resolution",
     ]
 
     selected_strategies = 0

diff --git a/planemo/options.py b/planemo/options.py
@@ -41,9 +41,9 @@ def brew_dependency_resolution():
     )
 
 
-def shed_brew_dependency_resolution():
+def shed_dependency_resolution():
     return click.option(
-        "--shed_brew_dependency_resolution",
+        "--shed_dependency_resolution",
         is_flag=True,
         help=("Configure Galaxy to use brewed Tool Shed dependency"
               " resolution."),