From 499357e508035e7c9ffb5d711e0f355e960e1e05 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 21 Jan 2016 14:30:25 +0000 Subject: [PATCH] Remove unneeded galaxy.model import in upload.py... ... and document the ability to remove from other data sources. --- tools/data_source/data_source.py | 1 - tools/data_source/upload.py | 2 -- tools/genomespace/genomespace_file_browser.py | 2 +- tools/genomespace/genomespace_importer.py | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/data_source/data_source.py b/tools/data_source/data_source.py index ccb0213c116..2d3dbcb9e5c 100644 --- a/tools/data_source/data_source.py +++ b/tools/data_source/data_source.py @@ -7,7 +7,6 @@ import sys import urllib from json import loads, dumps -# need to import TOOL_PROVIDED_JOB_METADATA_FILE (which will import galaxy.model) before sniff to resolve a circular import between galaxy.datatypes.registry and galaxy.model from galaxy.jobs import TOOL_PROVIDED_JOB_METADATA_FILE from galaxy.datatypes import sniff from galaxy.datatypes.registry import Registry diff --git a/tools/data_source/upload.py b/tools/data_source/upload.py index 625a3cd974e..ca09450ce3f 100644 --- a/tools/data_source/upload.py +++ b/tools/data_source/upload.py @@ -14,8 +14,6 @@ import urllib import zipfile from galaxy import util -# need to import model before sniff to resolve a circular import dependency -import galaxy.model # noqa from galaxy.datatypes import sniff from galaxy.datatypes.binary import Binary from galaxy.datatypes.registry import Registry diff --git a/tools/genomespace/genomespace_file_browser.py b/tools/genomespace/genomespace_file_browser.py index 32eeb1718c1..8e9e7370131 100644 --- a/tools/genomespace/genomespace_file_browser.py +++ b/tools/genomespace/genomespace_file_browser.py @@ -9,7 +9,7 @@ import urllib2 import urlparse -import galaxy.model # need to import model before sniff to resolve a circular import dependency +import galaxy.model # import no longer needed, remove next time this file is modified from galaxy.datatypes import sniff from galaxy.datatypes.registry import Registry diff --git a/tools/genomespace/genomespace_importer.py b/tools/genomespace/genomespace_importer.py index 3daf0f51c06..e1613d36593 100644 --- a/tools/genomespace/genomespace_importer.py +++ b/tools/genomespace/genomespace_importer.py @@ -10,7 +10,7 @@ import urllib import urllib2 import urlparse -import galaxy.model # need to import model before sniff to resolve a circular import dependency +import galaxy.model # import no longer needed, remove next time this file is modified from galaxy.datatypes import sniff from galaxy.datatypes.registry import Registry