Load both cat1 versions

galaxyproject · Feb 24, 2021 · 7445882 · 7445882
1 parent 0508584
commit 7445882
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/planemo/galaxy/config.py b/planemo/galaxy/config.py
@@ -536,8 +536,11 @@ def _all_tool_paths(runnables, **kwds):
         if runnable.type.name == "galaxy_workflow":
             tool_ids = find_tool_ids(runnable.path)
             for tool_id in tool_ids:
-                if tool_id in DISTRO_TOOLS_ID_TO_PATH:
-                    all_tool_paths.append(DISTRO_TOOLS_ID_TO_PATH[tool_id])
+                tool_paths = tool_id in DISTRO_TOOLS_ID_TO_PATH
+                if tool_paths:
+                    if isinstance(tool_paths, str):
+                        tool_paths = [tool_paths]
+                    all_tool_paths.extend(tool_paths)
 
     return all_tool_paths
 

diff --git a/planemo/galaxy/distro_tools.py b/planemo/galaxy/distro_tools.py
@@ -71,7 +71,7 @@
     "gtf_filter_by_attribute_values_list": "filters/gff/gtf_filter_by_attribute_values_list.xml",
     "Summary_Statistics1": "stats/gsummary.xml",
     "qual_stats_boxplot": "plotting/boxplot.xml",
-    "cat1": "filters/catWrapper.xml",
+    "cat1": ["filters/catWrapper.xml", "filters/catWrapper2.xml"],
     "maf_by_block_number1": "maf/maf_by_block_number.xml",
     "Grep1": "filters/grep.xml",
     "eupathdb": "data_source/eupathdb.xml",