Move set_metadata script from galaxy_utils to galaxy, remove unused

imports.
This commit is contained in:
Nate Coraor
2015-03-04 16:03:06 -05:00
parent de5d6d1150
commit e093f58d63
4 changed files with 3 additions and 7 deletions
+2 -2
View File
@@ -772,10 +772,10 @@ class JobExternalOutputMetadataWrapper( object ):
#return command required to build
fd, fp = tempfile.mkstemp( suffix='.py', dir = tmp_dir, prefix = "set_metadata_" )
metadata_script_file = abspath( fp )
os.fdopen( fd, 'w' ).write( 'from galaxy_utils.metadata.set_metadata import set_metadata; set_metadata()' )
os.fdopen( fd, 'w' ).write( 'from galaxy.metadata.set_metadata import set_metadata; set_metadata()' )
return "python %s %s" % ( metadata_script_file, args )
else:
# return args to galaxy_utils.metadata.set_metadata required to build
# return args to galaxy.metadata.set_metadata required to build
return args
def external_metadata_set_successfully( self, dataset, sa_session ):
+1 -1
View File
@@ -652,7 +652,7 @@ class Registry( object ):
<param name="__SET_EXTERNAL_METADATA_COMMAND_LINE__" type="hidden" value=""/>
</inputs>
<configfiles>
<configfile name="set_metadata">from galaxy_utils.metadata.set_metadata import set_metadata; set_metadata()</configfile>
<configfile name="set_metadata">from galaxy.metadata.set_metadata import set_metadata; set_metadata()</configfile>
</configfiles>
</tool>
"""
@@ -33,10 +33,6 @@ import galaxy.model.mapping # need to load this before we unpickle, in order to
galaxy.model.Job() # this looks REAL stupid, but it is REQUIRED in order for SA to insert parameters into the classes defined by the mappers --> it appears that instantiating ANY mapper'ed class would suffice here
from galaxy.util import stringify_dictionary_keys
from sqlalchemy.orm import clear_mappers
from galaxy.objectstore import build_object_store_from_config
from galaxy import config
import ConfigParser
from galaxy.util.properties import load_app_properties
def set_meta_with_tool_provided( dataset_instance, file_dict, set_meta_kwds ):