2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e7bcba2bec53/ Changeset: e7bcba2bec53 Branch: next-stable User: jmchilton Date: 2014-05-19 23:18:02 Summary: HACK: Fix circular dependency non-sense related to tools and dataset collections. https://gist.github.com/jmchilton/6e19d248002b1080e8ba. Affected #: 1 file diff -r c822084e6e5407c6ac80f999fa313808049e58f7 -r e7bcba2bec53e16c8e11bb136da9f8aad9e430ba lib/galaxy/tools/parameters/meta.py --- a/lib/galaxy/tools/parameters/meta.py +++ b/lib/galaxy/tools/parameters/meta.py @@ -2,8 +2,6 @@ from galaxy import model from galaxy import util from galaxy import exceptions -from galaxy.dataset_collections import matching -from galaxy.dataset_collections import subcollections import logging log = logging.getLogger( __name__ ) @@ -29,6 +27,7 @@ else: return permutations.input_classification.SINGLE, incoming[ input_key ] + from galaxy.dataset_collections import matching collections_to_match = matching.CollectionsToMatch() def collection_classifier( input_key ): @@ -52,6 +51,7 @@ hdc = trans.sa_session.query( model.HistoryDatasetCollectionAssociation ).get( hdc_id ) collections_to_match.add( input_key, hdc, subcollection_type=subcollection_type ) if subcollection_type is not None: + from galaxy.dataset_collections import subcollections subcollection_elements = subcollections.split_dataset_collection_instance( hdc, subcollection_type ) return permutations.input_classification.MATCHED, subcollection_elements else: https://bitbucket.org/galaxy/galaxy-central/commits/05302ebc7377/ Changeset: 05302ebc7377 User: jmchilton Date: 2014-05-19 23:18:31 Summary: Merge next-stable. Affected #: 1 file diff -r 35afd36f9014915c4c82f65b1c52a6636f48328e -r 05302ebc73772d383ef55781e7c59d7365258e5b lib/galaxy/tools/parameters/meta.py --- a/lib/galaxy/tools/parameters/meta.py +++ b/lib/galaxy/tools/parameters/meta.py @@ -2,8 +2,6 @@ from galaxy import model from galaxy import util from galaxy import exceptions -from galaxy.dataset_collections import matching -from galaxy.dataset_collections import subcollections import logging log = logging.getLogger( __name__ ) @@ -29,6 +27,7 @@ else: return permutations.input_classification.SINGLE, incoming[ input_key ] + from galaxy.dataset_collections import matching collections_to_match = matching.CollectionsToMatch() def collection_classifier( input_key ): @@ -52,6 +51,7 @@ hdc = trans.sa_session.query( model.HistoryDatasetCollectionAssociation ).get( hdc_id ) collections_to_match.add( input_key, hdc, subcollection_type=subcollection_type ) if subcollection_type is not None: + from galaxy.dataset_collections import subcollections subcollection_elements = subcollections.split_dataset_collection_instance( hdc, subcollection_type ) return permutations.input_classification.MATCHED, subcollection_elements else: 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.