1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/109b170188e9/
Changeset: 109b170188e9
Branch: stable
User: jmchilton
Date: 2014-08-27 20:39:43
Summary: Fix using multiple list collections with different identifiers in workflows.
Tools will pair off (or triplize, quadraplate, quintukify, etc...) based only on the index
of the elements in the collection (so any N element list can be used in the same tool
execution as any other N element list). Originally, I had decided to require the element
identifiers to be the same in both collections (allows mixing a matching fewer collections
in tools - but probably less likely to mismatch in a way the user did not intend). At any
rate - I changed that decision and updated tool execution appropriately but not every
aspect workflow collection 'pairing' - this fixes that and closes out this card
https://trello.com/c/m5PiF1lR.
In very partical terms tools would ideally be consuming collection pairs - but for those
that are still consuming two separate files (i.e. all of them) one can use two lists of
datasets with pairs at matching indices and feed them into these tools - for workflows
this doesn't work without this patch unless the identifiers and the indices match on
these collections.
Thanks for Michael Crusoe and takadonet for the bug reports.
Affected #: 1 file
diff -r 51de5214e6f9e59b9bad5a05ae6a79d6e8944a9e -r
109b170188e97fbfc2c998ec174aff9546dd1bd8 lib/galaxy/dataset_collections/structure.py
--- a/lib/galaxy/dataset_collections/structure.py
+++ b/lib/galaxy/dataset_collections/structure.py
@@ -35,9 +35,9 @@
return self._walk_collections( dict_map( lambda hdca: hdca.collection, hdca_dict
) )
def _walk_collections( self, collection_dict ):
- for ( identifier, substructure ) in self.children:
+ for index, ( identifier, substructure ) in enumerate( self.children ):
def element( collection ):
- return collection[ identifier ]
+ return collection[ index ]
if substructure.is_leaf:
yield dict_map( element, collection_dict )
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.