Mercurial > repos > devteam > data_manager_bowtie2_index_builder
changeset 5:8a892275932f draft
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/data_managers/data_manager_bowtie2_index_builder commit 8652f36a3a3838dca989426961561e81432acf4f
| author | iuc |
|---|---|
| date | Tue, 04 Apr 2017 17:48:28 -0400 |
| parents | c85369954c54 |
| children | bb050998cee2 |
| files | data_manager/bowtie2_index_builder.py data_manager/bowtie2_index_builder.xml tool_dependencies.xml |
| diffstat | 3 files changed, 40 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/data_manager/bowtie2_index_builder.py Fri Dec 18 18:29:59 2015 -0500 +++ b/data_manager/bowtie2_index_builder.py Tue Apr 04 17:48:28 2017 -0400 @@ -1,22 +1,22 @@ #!/usr/bin/env python -#Dan Blankenberg +# Dan Blankenberg +from __future__ import print_function -import sys +import optparse import os -import optparse import subprocess - -from json import loads, dumps - +import sys +from json import dumps, loads DEFAULT_DATA_TABLE_NAMES = ["bowtie2_indexes"] + def get_id_name( params, dbkey, fasta_description=None): - #TODO: ensure sequence_id is unique and does not already appear in location file + # TODO: ensure sequence_id is unique and does not already appear in location file sequence_id = params['param_dict']['sequence_id'] if not sequence_id: sequence_id = dbkey - + sequence_name = params['param_dict']['sequence_name'] if not sequence_name: sequence_name = fasta_description @@ -24,8 +24,9 @@ sequence_name = dbkey return sequence_id, sequence_name + def build_bowtie2_index( data_manager_dict, fasta_filename, params, target_directory, dbkey, sequence_id, sequence_name, data_table_names=DEFAULT_DATA_TABLE_NAMES ): - #TODO: allow multiple FASTA input files + # TODO: allow multiple FASTA input files fasta_base_name = os.path.split( fasta_filename )[-1] sym_linked_fasta_filename = os.path.join( target_directory, fasta_base_name ) os.symlink( fasta_filename, sym_linked_fasta_filename ) @@ -33,45 +34,48 @@ proc = subprocess.Popen( args=args, shell=False, cwd=target_directory ) return_code = proc.wait() if return_code: - print >> sys.stderr, "Error building index." + print("Error building index.", file=sys.stderr) sys.exit( return_code ) data_table_entry = dict( value=sequence_id, dbkey=dbkey, name=sequence_name, path=sequence_id ) for data_table_name in data_table_names: _add_data_table_entry( data_manager_dict, data_table_name, data_table_entry ) + def _add_data_table_entry( data_manager_dict, data_table_name, data_table_entry ): data_manager_dict['data_tables'] = data_manager_dict.get( 'data_tables', {} ) data_manager_dict['data_tables'][ data_table_name ] = data_manager_dict['data_tables'].get( data_table_name, [] ) data_manager_dict['data_tables'][ data_table_name ].append( data_table_entry ) return data_manager_dict + def main(): - #Parse Command Line parser = optparse.OptionParser() parser.add_option( '-f', '--fasta_filename', dest='fasta_filename', action='store', type="string", default=None, help='fasta_filename' ) parser.add_option( '-d', '--fasta_dbkey', dest='fasta_dbkey', action='store', type="string", default=None, help='fasta_dbkey' ) parser.add_option( '-t', '--fasta_description', dest='fasta_description', action='store', type="string", default=None, help='fasta_description' ) parser.add_option( '-n', '--data_table_name', dest='data_table_name', action='append', type="string", default=None, help='data_table_name' ) (options, args) = parser.parse_args() - + filename = args[0] - + params = loads( open( filename ).read() ) target_directory = params[ 'output_data' ][0]['extra_files_path'] os.mkdir( target_directory ) data_manager_dict = {} - + dbkey = options.fasta_dbkey - + if dbkey in [ None, '', '?' ]: raise Exception( '"%s" is not a valid dbkey. You must specify a valid dbkey.' % ( dbkey ) ) - + sequence_id, sequence_name = get_id_name( params, dbkey=dbkey, fasta_description=options.fasta_description ) - - #build the index + + # build the index build_bowtie2_index( data_manager_dict, options.fasta_filename, params, target_directory, dbkey, sequence_id, sequence_name, data_table_names=options.data_table_name or DEFAULT_DATA_TABLE_NAMES ) - - #save info to json file + + # save info to json file open( filename, 'wb' ).write( dumps( data_manager_dict ) ) - -if __name__ == "__main__": main() + + +if __name__ == "__main__": + main()
--- a/data_manager/bowtie2_index_builder.xml Fri Dec 18 18:29:59 2015 -0500 +++ b/data_manager/bowtie2_index_builder.xml Tue Apr 04 17:48:28 2017 -0400 @@ -1,30 +1,31 @@ -<tool id="bowtie2_index_builder_data_manager" name="Bowtie2 index" tool_type="manage_data" version="2.2.6"> +<tool id="bowtie2_index_builder_data_manager" name="Bowtie2 index" tool_type="manage_data" version="2.3.0"> <description>builder</description> <requirements> - <requirement type="package" version="2.2.6">bowtie2</requirement> + <requirement type="package" version="2.3.0">bowtie2</requirement> </requirements> - <command interpreter="python">bowtie2_index_builder.py "${out_file}" --fasta_filename "${all_fasta_source.fields.path}" --fasta_dbkey "${all_fasta_source.fields.dbkey}" --fasta_description "${all_fasta_source.fields.name}" --data_table_name "bowtie2_indexes" ${tophat2}</command> - <stdio> - <exit_code range=":-1" /> - <exit_code range="1:" /> - </stdio> + <command detect_errors="exit_code"><![CDATA[ + python '$__tool_directory__/bowtie2_index_builder.py' + '${out_file}' + --fasta_filename '${all_fasta_source.fields.path}' + --fasta_dbkey '${all_fasta_source.fields.dbkey}' + --fasta_description '${all_fasta_source.fields.name}' + --data_table_name bowtie2_indexes ${tophat2} + ]]></command> <inputs> <param name="all_fasta_source" type="select" label="Source FASTA Sequence"> <options from_data_table="all_fasta"/> </param> - <param type="text" name="sequence_name" value="" label="Name of sequence" /> - <param type="text" name="sequence_id" value="" label="ID for sequence" /> - <param type="boolean" name="tophat2" label="Also make available for TopHat" checked="True" truevalue="--data_table_name tophat2_indexes" falsevalue="" help="Adds values to tophat2_indexes tool data table." /> + <param name="sequence_name" type="text" value="" label="Name of sequence" /> + <param name="sequence_id" type="text" value="" label="ID for sequence" /> + <param name="tophat2" type="boolean" truevalue="--data_table_name tophat2_indexes" falsevalue="" checked="True" label="Also make available for TopHat" help="Adds values to tophat2_indexes tool data table" /> </inputs> <outputs> <data name="out_file" format="data_manager_json"/> </outputs> <help> - .. class:: infomark -**Notice:** If you leave name, description, or id blank, it will be generated automatically. - +**Notice:** If you leave name, description, or id blank, it will be generated automatically. </help> </tool>
--- a/tool_dependencies.xml Fri Dec 18 18:29:59 2015 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<tool_dependency> - <package name="bowtie2" version="2.2.6"> - <repository changeset_revision="9d2f1e2f5919" name="package_bowtie_2_2_6" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu" /> - </package> -</tool_dependency>