| Previous changeset 7:b77178f66fc3 (2015-11-11) Next changeset 9:e66b9b5b8580 (2017-02-19) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-devteam/tree/master/tool_collections/cufflinks/cuffcompare commit eb18f691975ef9539b5ebd4f118343c8ad967a1f |
|
modified:
cuff_macros.xml cuffcompare_wrapper.py cuffcompare_wrapper.xml |
| b |
| diff -r b77178f66fc3 -r 1322b73ffe44 cuff_macros.xml --- a/cuff_macros.xml Wed Nov 11 12:34:16 2015 -0500 +++ b/cuff_macros.xml Tue Feb 07 18:38:41 2017 -0500 |
| [ |
| @@ -1,11 +1,13 @@ <macros> <token name="@VERSION@">2.2.1</token> + <xml name="requirements"> <requirements> <requirement type="package" version="2.2.1">cufflinks</requirement> <yield /> </requirements> </xml> + <xml name="stdio"> <stdio> <exit_code range="1:" /> @@ -26,21 +28,21 @@ </param> <when value="BAM"> <repeat name="conditions" title="Condition" min="2"> - <param name="name" title="Condition name" type="text" label="Name"/> + <param name="name" label="Condition name" type="text"/> <param name="samples" label="Replicates" type="data" format="sam,bam" multiple="true"/> </repeat> </when> <when value="CXB"> <repeat name="conditions" title="Condition" min="2"> - <param name="name" title="Condition name" type="text" label="Name"/> + <param name="name" label="Condition name" type="text"/> <param name="samples" label="Replicates" type="data" format="cxb" multiple="true"/> </repeat> </when> <when value="CONDITION_LIST"> - <param name="conditions" title="List of Conditions" type="data_collection" collection_type="list" /> + <param name="conditions" label="List of Conditions" type="data_collection" collection_type="list" /> </when> <when value="CONDITION_REPLICATE_LIST"> - <param name="conditions" title="List of Conditions" type="data_collection" collection_type="list:list" /> + <param name="conditions" label="List of Conditions" type="data_collection" collection_type="list:list" /> </when> </conditional> </xml> @@ -48,16 +50,16 @@ #if $in_type.set_in_type in ['BAM', 'CXB'] #for $condition in $in_type.conditions: #set samples = ','.join( [ str( $sample ) for $sample in $condition.samples ] ) - $samples + '$samples' #end for #elif $in_type.set_in_type == 'CONDITION_LIST' #for $sample in $in_type.conditions: - $sample + '$sample' #end for #elif $in_type.set_in_type == 'CONDITION_REPLICATE_LIST' #for $condition_list in $in_type.conditions: #set samples = ','.join( [ str( $sample ) for $sample in $condition_list ] ) - $samples + '$samples' #end for #end if </token> @@ -79,11 +81,11 @@ <token name="@CUFFLINKS_GTF_INPUTS@"> ## Inputs. #for $input_file in $inputs: - "${input_file}" + '${input_file}' #end for #for $additional_input in $additional_inputs: #for $input_file in $additional_input.additional_inputs: - "${input_file}" + '${input_file}' #end for #end for </token> |
| b |
| diff -r b77178f66fc3 -r 1322b73ffe44 cuffcompare_wrapper.py --- a/cuffcompare_wrapper.py Wed Nov 11 12:34:16 2015 -0500 +++ b/cuffcompare_wrapper.py Tue Feb 07 18:38:41 2017 -0500 |
| b |
| b'@@ -2,135 +2,133 @@\n \n # Supports Cuffcompare versions v1.3.0 and newer.\n \n-import optparse, os, shutil, subprocess, sys, tempfile\n+import optparse\n+import os\n+import shutil\n+import subprocess\n+import sys\n+import tempfile\n \n-def stop_err( msg ):\n- sys.stderr.write( \'%s\\n\' % msg )\n+\n+def stop_err(msg):\n+ sys.stderr.write(\'%s\\n\' % msg)\n sys.exit()\n \n+\n def __main__():\n- #Parse Command Line\n parser = optparse.OptionParser()\n- parser.add_option( \'-r\', dest=\'ref_annotation\', help=\'An optional "reference" annotation GTF. Each sample is matched against this file, and sample isoforms are tagged as overlapping, matching, or novel where appropriate. See the refmap and tmap output file descriptions below.\' )\n- parser.add_option( \'-R\', action="store_true", dest=\'ignore_nonoverlap_reference\', help=\'If -r was specified, this option causes cuffcompare to ignore reference transcripts that are not overlapped by any transcript in one of cuff1.gtf,...,cuffN.gtf. Useful for ignoring annotated transcripts that are not present in your RNA-Seq samples and thus adjusting the "sensitivity" calculation in the accuracy report written in the transcripts accuracy file\' )\n- parser.add_option( \'-Q\', action="store_true", dest=\'ignore_nonoverlap_transfrag\', help=\'If -r was specified, this option causes cuffcompare to consider only the input transcripts that overlap any of the reference transcripts (Sp correction); Warning: this will discard all "novel" loci!)\' )\n+ parser.add_option(\'-r\', dest=\'ref_annotation\', help=\'An optional "reference" annotation GTF. Each sample is matched against this file, and sample isoforms are tagged as overlapping, matching, or novel where appropriate. See the refmap and tmap output file descriptions below.\')\n+ parser.add_option(\'-R\', action="store_true", dest=\'ignore_nonoverlap_reference\', help=\'If -r was specified, this option causes cuffcompare to ignore reference transcripts that are not overlapped by any transcript in one of cuff1.gtf,...,cuffN.gtf. Useful for ignoring annotated transcripts that are not present in your RNA-Seq samples and thus adjusting the "sensitivity" calculation in the accuracy report written in the transcripts accuracy file\')\n+ parser.add_option(\'-Q\', action="store_true", dest=\'ignore_nonoverlap_transfrag\', help=\'If -r was specified, this option causes cuffcompare to consider only the input transcripts that overlap any of the reference transcripts (Sp correction); Warning: this will discard all "novel" loci!)\')\n \n- parser.add_option( \'-s\', dest=\'use_seq_data\', action="store_true", help=\'Causes cuffcompare to look into for fasta files with the underlying genomic sequences (one file per contig) against which your reads were aligned for some optional classification functions. For example, Cufflinks transcripts consisting mostly of lower-case bases are classified as repeats. Note that <seq_dir> must contain one fasta file per reference chromosome, and each file must be named after the chromosome, and have a .fa or .fasta extension.\')\n- \n- parser.add_option( \'-M\', action="store_true", dest=\'discard_single_exon_all\', help=\'discard (ignore) single-exon transfrags and reference transcript\')\n- parser.add_option( \'-N\', action="store_true", dest=\'discard_single_exon_ref\', help=\'discard (ignore) single-exon reference transcripts\')\n- parser.add_option( \'-e\', dest=\'max_dist_exon\', help=\'Max. Distance for assessing exon accuracy" help="max. distance (range) allowed from free ends of terminal exons of reference transcripts when assessing exon accuracy. Default: 100\')\n- parser.add_option( \'-d\', dest=\'max_dist_group\', help=\'Max.Distance for transcript grouping" help="max. distance (range) for grouping transcript start sites. Default: 100\')\n- parser.add_option( \'-F\', action="store_true", dest=\'discard_redundant_intron_transfrags\', help=\'Discard intron-redundant transfrags if they share the 5-prime end (if they differ only at the 3-prime end)\')\n+ parser.add_option(\''..b's.\n if options.ref_annotation:\n cmd += " -r %s " % options.ref_annotation\n if options.ignore_nonoverlap_reference:\n cmd += " -R "\n if options.ignore_nonoverlap_transfrag:\n-\tcmd += " -Q "\n+ cmd += " -Q "\n if options.use_seq_data:\n cmd += " -s %s " % seq_path\n if options.discard_single_exon_all:\n-\tcmd += " -M "\n+ cmd += " -M "\n if options.discard_single_exon_ref:\n-\tcmd += " -N "\n+ cmd += " -N "\n if options.max_dist_exon:\n-\tcmd += " -e %i " % int( options.max_dist_exon )\n+ cmd += " -e %i " % int(options.max_dist_exon)\n if options.max_dist_group:\n-\tcmd += " -d %i " % int( options.max_dist_group )\n- if options.discard_redundant_intron_transfrags: \n-\tcmd += " -F "\n+ cmd += " -d %i " % int(options.max_dist_group)\n+ if options.discard_redundant_intron_transfrags:\n+ cmd += " -F "\n # Add input files.\n- \n- # Need to symlink inputs so that output files are written to temp directory.\n- for i, arg in enumerate( args ):\n- input_file_name = "./input%i" % ( i+1 )\n- os.symlink( arg, input_file_name )\n+\n+ # Need to symlink inputs so that output files are written to the current directory.\n+ for i, arg in enumerate(args):\n+ input_file_name = "./input%i" % (i + 1)\n+ os.symlink(arg, input_file_name)\n cmd += "%s " % input_file_name\n \n- # Debugging.\n- print cmd\n- \n # Run command.\n- try: \n- tmp_name = tempfile.NamedTemporaryFile( dir="." ).name\n- tmp_stderr = open( tmp_name, \'wb\' )\n- proc = subprocess.Popen( args=cmd, shell=True, stderr=tmp_stderr.fileno() )\n- returncode = proc.wait()\n- tmp_stderr.close()\n- \n- # Get stderr, allowing for case where it\'s very large.\n- tmp_stderr = open( tmp_name, \'rb\' )\n- stderr = \'\'\n- buffsize = 1048576\n- try:\n- while True:\n- stderr += tmp_stderr.read( buffsize )\n- if not stderr or len( stderr ) % buffsize != 0:\n- break\n- except OverflowError:\n- pass\n- tmp_stderr.close()\n- \n- # Error checking.\n- if returncode != 0:\n- raise Exception, stderr\n- \n+ try:\n+ with tempfile.NamedTemporaryFile(dir=".") as tmp_stderr:\n+ returncode = subprocess.call(args=cmd, stderr=tmp_stderr, shell=True)\n+\n+ # Error checking.\n+ if returncode != 0:\n+ # Get stderr, allowing for case where it\'s very large.\n+ buffsize = 1048576\n+ stderr = \'\'\n+ with open(tmp_stderr.name) as tmp_stderr2:\n+ try:\n+ while True:\n+ stderr += tmp_stderr2.read(buffsize)\n+ if not stderr or len(stderr) % buffsize != 0:\n+ break\n+ except OverflowError:\n+ pass\n+ raise Exception(stderr)\n+\n # Copy outputs.\n- shutil.copyfile( "cc_output.combined.gtf" , options.combined_transcripts ) \n- \n+ shutil.move("cc_output.combined.gtf", options.combined_transcripts)\n+\n # check that there are results in the output file\n cc_output_fname = "cc_output.stats"\n- if len( open( cc_output_fname, \'rb\' ).read().strip() ) == 0:\n- raise Exception, \'The main output file is empty, there may be an error with your input file or settings.\'\n- except Exception, e:\n- stop_err( \'Error running cuffcompare. \' + str( e ) )\n- \n-if __name__=="__main__": __main__()\n+ if len(open(cc_output_fname).read().strip()) == 0:\n+ raise Exception(\'The main output file is empty, there may be an error with your input file or settings.\')\n+ except Exception as e:\n+ stop_err(\'Error running cuffcompare: %s\' % e)\n+\n+\n+if __name__ == "__main__":\n+ __main__()\n' |
| b |
| diff -r b77178f66fc3 -r 1322b73ffe44 cuffcompare_wrapper.xml --- a/cuffcompare_wrapper.xml Wed Nov 11 12:34:16 2015 -0500 +++ b/cuffcompare_wrapper.xml Tue Feb 07 18:38:41 2017 -0500 |
| b |
| @@ -1,16 +1,16 @@ <tool id="cuffcompare" name="Cuffcompare" version="2.2.1.0"> <description>compare assembled transcripts to a reference annotation and track Cufflinks transcripts across multiple experiments</description> - <expand macro="requirements" /> - <expand macro="stdio" /> <macros> <import>cuff_macros.xml</import> </macros> + <expand macro="requirements" /> + <expand macro="stdio" /> <version_command>cuffcompare 2>&1 | head -n 1</version_command> - <command interpreter="python"> - cuffcompare_wrapper.py + <command> + python '$__tool_directory__/cuffcompare_wrapper.py' ## Use annotation reference? #if $annotation.use_ref_annotation == "Yes": - -r $annotation.reference_annotation + -r '$annotation.reference_annotation' #if $annotation.ignore_nonoverlapping_reference: -R #end if @@ -24,9 +24,9 @@ #if $seq_data.use_seq_data == "Yes": -s #if $seq_data.seq_source.index_source == "history": - --ref_file=$seq_data.seq_source.ref_file + --ref_file '$seq_data.seq_source.ref_file' #else: - --index=${seq_data.seq_source.index.fields.path} + --index '${seq_data.seq_source.index.fields.path}' #end if #end if @@ -40,7 +40,7 @@ #end if ## Outputs. - --combined-transcripts=${transcripts_combined} + --combined-transcripts '${transcripts_combined}' @CUFFLINKS_GTF_INPUTS@ </command> |