# HG changeset patch # User Wise, Catherine (Digital, Acton) # Date 1435185398 -36000 # Node ID 7301c2e96fce58fd76c5af4e4936218c736f3ef8 # Parent 3e8bd0d017252a336bffc670aa0a793d85f770cd Fix circular dependency diff -r 3e8bd0d01725 -r 7301c2e96fce TrustStoreGalaxyBrowse.py --- a/TrustStoreGalaxyBrowse.py Thu Jun 25 08:26:34 2015 +1000 +++ b/TrustStoreGalaxyBrowse.py Thu Jun 25 08:36:38 2015 +1000 @@ -9,6 +9,7 @@ import operator import urlparse from py_ts import TrustStoreClient, utils +import galaxy.model # need to import model before sniff to resolve a circular import dependency from galaxy.datatypes.checkers import util from galaxy.datatypes import sniff from galaxy.datatypes.registry import Registry