opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6227 from jmchilton/collection_type_source_regression

Browse Source 
[18.05] Fix broken collection_type_source tool and test.
This commit is contained in:
Björn Grüning
2018-05-27 07:48:02 +02:00
committed by GitHub
parent 221897be04 02feb17350
commit c9641e1f13
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parser/output_objects.py
+2 -2
View File
@@ -188,8 +188,8 @@ class ToolOutputCollectionStructure(object):
raise ValueError("Cannot set both type and type_source on collection output.")
if collection_type is None and structured_like is None and dataset_collector_descriptions is None and collection_type_source is None and collection_type_from_rules is None:
raise ValueError("Output collection types must specify source of collection type information (e.g. structured_like or type_source).")
if dataset_collector_descriptions and (structured_like or collection_type_source or collection_type_from_rules):
raise ValueError("Cannot specify dynamic structure (discovered_datasets) and collection type source attributes such as structured_like or type_source.")
if dataset_collector_descriptions and (structured_like or collection_type_from_rules):
raise ValueError("Cannot specify dynamic structure (discovered_datasets) and collection type attributes structured_like or collection_type_from_rules.")
self.dynamic = dataset_collector_descriptions is not None
def collection_prototype(self, inputs, type_registry):