# HG changeset patch # User iuc # Date 1532438967 14400 # Node ID a26ed87f444c429ecc412f3f714ca1bc134799bc # Parent 0b1c04a9018242d8385720af67da441d657fd914 planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/hisat2 commit ac79103bf57c195226877a698dc197a965f82aba diff -r 0b1c04a90182 -r a26ed87f444c hisat2.xml --- a/hisat2.xml Sat Jul 14 09:06:59 2018 -0400 +++ b/hisat2.xml Tue Jul 24 09:29:27 2018 -0400 @@ -1,11 +1,12 @@ - + A fast and sensitive alignment program hisat2_macros.xml hisat2 - samtools + samtools + seqtk @@ -42,10 +43,10 @@ #if $library.input_1.is_of_type("fastq.gz", "fastqsanger.gz"): #set read1 = "input_f.fastq.gz" #set compressed = "GZ" - #else if $library.input_1.is_of_type("fastq.bz2", "fastqsanger.bz2"): + #elif $library.input_1.is_of_type("fastq.bz2", "fastqsanger.bz2"): #set read1 = "input_f.fastq.bz2" #set compressed = "BZ2" - #else if $library.input_1.is_of_type('fasta'): + #elif $library.input_1.is_of_type('fasta'): #set reads_are_fastq = False #set read1 = "input_f.fasta" #else: @@ -56,24 +57,24 @@ #if $library.input_2.is_of_type("fastq.gz", "fastqsanger.gz"): #set read2 = "input_r.fastq.gz" #set compressed = "GZ" - #else if $library.input_2.is_of_type("fastq.bz2", "fastqsanger.bz2"): + #elif $library.input_2.is_of_type("fastq.bz2", "fastqsanger.bz2"): #set read2 = "input_r.fastq.bz2" #set compressed = "BZ2" - #else if $library.input_2.is_of_type('fasta'): + #elif $library.input_2.is_of_type('fasta'): #set read2 = "input_r.fasta" #else: #set read2 = "input_r.fastq" #end if ln -f -s '${library.input_2}' ${read2} && -#else if str($library.type) == 'paired_collection': +#elif str($library.type) == 'paired_collection': #if $library.input_1.forward.is_of_type("fastq.gz", "fastqsanger.gz"): #set read1 = "input_f.fastq.gz" #set compressed = "GZ" - #else if $library.input_1.forward.is_of_type("fastq.bz2", "fastqsanger.bz2"): + #elif $library.input_1.forward.is_of_type("fastq.bz2", "fastqsanger.bz2"): #set read1 = "input_f.fastq.bz2" #set compressed = "BZ2" - #else if $library.input_1.forward.is_of_type('fasta'): + #elif $library.input_1.forward.is_of_type('fasta'): #set reads_are_fastq = False #set read1 = "input_f.fasta" #else: @@ -84,24 +85,44 @@ #if $library.input_1.reverse.is_of_type("fastq.gz", "fastqsanger.gz"): #set read2 = "input_r.fastq.gz" #set compressed = "GZ" - #else if $library.input_1.reverse.is_of_type("fastq.bz2", "fastqsanger.bz2"): + #elif $library.input_1.reverse.is_of_type("fastq.bz2", "fastqsanger.bz2"): #set read2 = "input_r.fastq.bz2" #set compressed = "BZ2" - #else if $library.input_1.reverse.is_of_type("fasta"): + #elif $library.input_1.reverse.is_of_type("fasta"): #set read2 = "input_r.fasta" #else: #set read2 = "input_r.fastq" #end if ln -s '${library.input_1.reverse}' ${read2} && - +#elif str( $library.type ) == "paired_interleaved": + #if $library.input_1.is_of_type("fastq.gz", "fastqsanger.gz"): + #set interleaved_reads = "input_f.fastq.gz" + #set compressed = "GZ" + #elif $library.input_1.is_of_type("fastq.bz2", "fastqsanger.bz2"): + #set interleaved_reads = "input_f.fastq.bz2" + #set compressed = "BZ2" + #elif $library.input_1.is_of_type('fasta'): + #set reads_are_fastq = False + #set interleaved_reads = "input_f.fasta" + #else: + #set interleaved_reads = "input_f.fastq" + #end if + ln -f -s '${library.input_1}' ${interleaved_reads} && + #if $library.input_1.is_of_type("fastq.bz2", "fastqsanger.bz2"): + #set read1 = "<(bzcat input_f.fastq.bz2 | seqtk seq -1 /dev/stdin)" + #set read2 = "<(bzcat input_f.fastq.bz2 | seqtk seq -2 /dev/stdin)" + #else: + #set read1 = "<(seqtk seq -1 %s)" % $interleaved_reads + #set read2 = "<(seqtk seq -2 %s)" % $interleaved_reads + #end if #else: #if $library.input_1.is_of_type("fastq.gz", "fastqsanger.gz"): #set read1 = "input_f.fastq.gz" #set compressed = "GZ" - #else if $library.input_1.is_of_type("fastq.bz2", "fastqsanger.bz2"): + #elif $library.input_1.is_of_type("fastq.bz2", "fastqsanger.bz2"): #set read1 = "input_f.fastq.bz2" #set compressed = "BZ2" - #else if $library.input_1.is_of_type('fasta'): + #elif $library.input_1.is_of_type('fasta'): #set reads_are_fastq = False #set read1 = "input_f.fasta" #else: @@ -136,7 +157,7 @@ #if str( $adv.output_options.unaligned_file ) == "true": #if $compressed == "GZ": --un-gz '$output_unaligned_reads_l' - #else if $compressed == "BZ2": + #elif $compressed == "BZ2": --un-bz2 '$output_unaligned_reads_l' #else: --un '$output_unaligned_reads_l' @@ -146,7 +167,7 @@ #if str( $adv.output_options.aligned_file ) == "true": #if $compressed == "GZ": --al-gz '$output_aligned_reads_l' - #else if $compressed == "BZ2": + #elif $compressed == "BZ2": --al-bz2 '$output_aligned_reads_l' #else: --al '$output_aligned_reads_l' @@ -155,15 +176,19 @@ #end if #else: - - -1 '${read1}' - -2 '${read2}' - + ##quotes are embedded in r1 and r2 variables, needed to allow use of <() + #if str( $library.type ) == "paired_interleaved": + -1 ${read1} + -2 ${read2} + #else: + -1 '${read1}' + -2 '${read2}' + #end if #if str($adv.output_options.output_options_selector) == "advanced": #if str( $adv.output_options.unaligned_file ) == "true": #if $compressed == "GZ": --un-conc-gz '${output_unaligned_reads_l}' - #else if $compressed == "BZ2": + #elif $compressed == "BZ2": --un-conc-bz2 '${output_unaligned_reads_l}' #else: --un-conc '${output_unaligned_reads_l}' @@ -173,7 +198,7 @@ #if str( $adv.output_options.aligned_file ) == "true": #if $compressed == "GZ": --al-conc-gz '${output_aligned_reads_l}' - #else if $compressed == "BZ2": + #elif $compressed == "BZ2": --al-conc-bz2 '${output_aligned_reads_l}' #else: --al-conc '${output_aligned_reads_l}' @@ -292,11 +317,11 @@ ## Convert SAM output to sorted BAM ## using the two pipe stages has the following effect ## - hisat2 and sort run in parallel, during this time sort produces -## presorted temporary files but does not produce output (hence +## presorted temporary files but does not produce output (hence ## view does not run) -## - once hisat is finished sort will start to merge the temporary -## files (which should be fast also on a single thread) gives the -## sorted output to view which only compresses the files (now +## - once hisat is finished sort will start to merge the temporary +## files (which should be fast also on a single thread) gives the +## sorted output to view which only compresses the files (now ## using full parallelism again) | samtools sort -l 0 -O bam | samtools view -O bam -@ \${GALAXY_SLOTS:-1} -o '${output_alignments}' @@ -342,10 +367,11 @@ - + - + + @@ -368,6 +394,10 @@ + + + + @@ -709,6 +739,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10.1038/nmeth.3317 diff -r 0b1c04a90182 -r a26ed87f444c test-data/hisat_input_1_interleaved.fasta --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/hisat_input_1_interleaved.fasta Tue Jul 24 09:29:27 2018 -0400 @@ -0,0 +1,40 @@ +>phiX174_1980_2501_0:1:0_3:0:0_0/1 +TTAGGTGTGTGTAAAACAGGTGCCGAAGAAGCTGGATTAACAGAATTGAGAACCAGCTTATCAGAAAAAA +>phiX174_1980_2501_0:1:0_3:0:0_0/2 +GTGAAATTTCTAGGAAGGATGTTTTCCGTTCTGGTGATTCGTCTAAGAAGTTTAAGATTGCTGAGGGTCA +>phiX174_1542_1965_0:0:0_0:0:0_1/1 +CTCGCCAAATGACGACTTCTACCACATCTATTGACATTATGGGTCTGCAAGCTGCTTATGCTAATTTGCA +>phiX174_1542_1965_0:0:0_0:0:0_1/2 +CCATACAAAACAGGGTCGCCAGCAATATCGGTATAAGTCAAAGCACCTTTAGCGTTAAGGTACTGAATCT +>phiX174_2950_3377_0:0:0_2:0:0_2/1 +CTCAAATCCGGCGTCAACCATACCAGCATAGGAAGCATCAGCACCAGCACGCTCCCAAGCATTAATCTCA +>phiX174_2950_3377_0:0:0_2:0:0_2/2 +GCGGTATTGCTTCTGCTCTTGCTGGTGGCGCCATGTCTAAATTGTTTGGAGGCGGTCAAAAAGCCGCCTC +>phiX174_2259_2739_1:0:0_1:0:0_3/1 +CTCGCGATTCAATCATGACTTCGTGATAAAAGATTGAGTGTGAGGTTATAACGCCGAAGCGGTAAAAAAT +>phiX174_2259_2739_1:0:0_1:0:0_3/2 +GCGACCATTCAAAGGATAAACATCATAGGCAGTCGGGAGGGTAGTCGGAACCGACGAAGACTCAAAGCGA +>phiX174_1141_1609_1:0:0_1:0:0_4/1 +TGGCGCTCTCCGTCTTTCTCCATTTCGTCGTGGCCTTGCTATTGACTCTACTGTAGACATTTTTACTTTT +>phiX174_1141_1609_1:0:0_1:0:0_4/2 +CAAATTAGCATAAGCAGCTTGCAGACCCATAATGTCAATAGATGTGGTAGAAGTCGTCATTTGGCTAGAA +>phiX174_185_708_0:0:0_1:0:0_5/1 +CCTTTCGCCATCAACTAACGATTCTGTCAAAAACTGACGCGTTGGATGAGGAGAAGTGGCTTAATATGCT +>phiX174_185_708_0:0:0_1:0:0_5/2 +TGTTTTCCGTAAATTCAGCGCCTTCCATGATGCGACAGGCCGTTTGAATGTTGACGGGATGAACATAATA +>phiX174_1363_1914_3:0:0_0:0:0_6/1 +GCGTTAAGGTACTGAATCTCTTTAGTCGCAGTAGGCGGAAAACGAACAAGCGCAAGAGTAAACATAGTGC +>phiX174_1363_1914_3:0:0_0:0:0_6/2 +TAAGCATTTGTTTCAGGGTTATTTGAATATCTATAACAACTATTTTCAAGCGCCGAGGATGCGTGACCGT +>phiX174_3199_3732_0:0:0_1:0:0_7/1 +CTGGCACTTCTGCCGTTTCTGATAAGTTGCTTGATTTGGTTGGACTTGGTGGCAAGTCTGCCGCTGATAA +>phiX174_3199_3732_0:0:0_1:0:0_7/2 +TCTGCGTTTGCTGATGAACTAAGTCAACCTCAGCACTAACCTTGCGAGTCATTTCATTGATTTGGTCATT +>phiX174_36_572_1:0:0_0:0:0_8/1 +ACCATAAACGCAAGCCTCAACGCAGCGACGAGCACGAGAGCGGTCAGTAGCAATCCAAACTTTGTTACTC +>phiX174_36_572_1:0:0_0:0:0_8/2 +TTTCGGATATTTCTGATGAGTCGAAAAATTATCTTGATAAAGCAGTAATTACTACTGCTTGTTTACGAAT +>phiX174_2128_2577_0:0:0_4:0:0_9/1 +TTCTGGTGATTTGCAAGAACGCGTACTTATTCGCCACCATGATTATGACCAGTGTTTCCAGTCCGTTCAG +>phiX174_2128_2577_0:0:0_4:0:0_9/2 +CTGAATGGAATTAAGAAAACCACCAATACCAGCATTAACCTTCAAACTATCAAAATATAACGTTGACGAT diff -r 0b1c04a90182 -r a26ed87f444c test-data/hisat_input_1_interleaved.fastq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/hisat_input_1_interleaved.fastq Tue Jul 24 09:29:27 2018 -0400 @@ -0,0 +1,80 @@ +@phiX174_1980_2501_0:1:0_3:0:0_0/1 +TTAGGTGTGTGTAAAACAGGTGCCGAAGAAGCTGGATTAACAGAATTGAGAACCAGCTTATCAGAAAAAA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_1980_2501_0:1:0_3:0:0_0/2 +GTGAAATTTCTAGGAAGGATGTTTTCCGTTCTGGTGATTCGTCTAAGAAGTTTAAGATTGCTGAGGGTCA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_1542_1965_0:0:0_0:0:0_1/1 +CTCGCCAAATGACGACTTCTACCACATCTATTGACATTATGGGTCTGCAAGCTGCTTATGCTAATTTGCA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_1542_1965_0:0:0_0:0:0_1/2 +CCATACAAAACAGGGTCGCCAGCAATATCGGTATAAGTCAAAGCACCTTTAGCGTTAAGGTACTGAATCT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_2950_3377_0:0:0_2:0:0_2/1 +CTCAAATCCGGCGTCAACCATACCAGCATAGGAAGCATCAGCACCAGCACGCTCCCAAGCATTAATCTCA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_2950_3377_0:0:0_2:0:0_2/2 +GCGGTATTGCTTCTGCTCTTGCTGGTGGCGCCATGTCTAAATTGTTTGGAGGCGGTCAAAAAGCCGCCTC ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_2259_2739_1:0:0_1:0:0_3/1 +CTCGCGATTCAATCATGACTTCGTGATAAAAGATTGAGTGTGAGGTTATAACGCCGAAGCGGTAAAAAAT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_2259_2739_1:0:0_1:0:0_3/2 +GCGACCATTCAAAGGATAAACATCATAGGCAGTCGGGAGGGTAGTCGGAACCGACGAAGACTCAAAGCGA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_1141_1609_1:0:0_1:0:0_4/1 +TGGCGCTCTCCGTCTTTCTCCATTTCGTCGTGGCCTTGCTATTGACTCTACTGTAGACATTTTTACTTTT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_1141_1609_1:0:0_1:0:0_4/2 +CAAATTAGCATAAGCAGCTTGCAGACCCATAATGTCAATAGATGTGGTAGAAGTCGTCATTTGGCTAGAA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_185_708_0:0:0_1:0:0_5/1 +CCTTTCGCCATCAACTAACGATTCTGTCAAAAACTGACGCGTTGGATGAGGAGAAGTGGCTTAATATGCT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_185_708_0:0:0_1:0:0_5/2 +TGTTTTCCGTAAATTCAGCGCCTTCCATGATGCGACAGGCCGTTTGAATGTTGACGGGATGAACATAATA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_1363_1914_3:0:0_0:0:0_6/1 +GCGTTAAGGTACTGAATCTCTTTAGTCGCAGTAGGCGGAAAACGAACAAGCGCAAGAGTAAACATAGTGC ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_1363_1914_3:0:0_0:0:0_6/2 +TAAGCATTTGTTTCAGGGTTATTTGAATATCTATAACAACTATTTTCAAGCGCCGAGGATGCGTGACCGT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_3199_3732_0:0:0_1:0:0_7/1 +CTGGCACTTCTGCCGTTTCTGATAAGTTGCTTGATTTGGTTGGACTTGGTGGCAAGTCTGCCGCTGATAA ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_3199_3732_0:0:0_1:0:0_7/2 +TCTGCGTTTGCTGATGAACTAAGTCAACCTCAGCACTAACCTTGCGAGTCATTTCATTGATTTGGTCATT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_36_572_1:0:0_0:0:0_8/1 +ACCATAAACGCAAGCCTCAACGCAGCGACGAGCACGAGAGCGGTCAGTAGCAATCCAAACTTTGTTACTC ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_36_572_1:0:0_0:0:0_8/2 +TTTCGGATATTTCTGATGAGTCGAAAAATTATCTTGATAAAGCAGTAATTACTACTGCTTGTTTACGAAT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_2128_2577_0:0:0_4:0:0_9/1 +TTCTGGTGATTTGCAAGAACGCGTACTTATTCGCCACCATGATTATGACCAGTGTTTCCAGTCCGTTCAG ++ +2222222222222222222222222222222222222222222222222222222222222222222222 +@phiX174_2128_2577_0:0:0_4:0:0_9/2 +CTGAATGGAATTAAGAAAACCACCAATACCAGCATTAACCTTCAAACTATCAAAATATAACGTTGACGAT ++ +2222222222222222222222222222222222222222222222222222222222222222222222 diff -r 0b1c04a90182 -r a26ed87f444c test-data/hisat_input_1_interleaved.fastq.bz2 Binary file test-data/hisat_input_1_interleaved.fastq.bz2 has changed diff -r 0b1c04a90182 -r a26ed87f444c test-data/hisat_input_1_interleaved.fastq.gz Binary file test-data/hisat_input_1_interleaved.fastq.gz has changed diff -r 0b1c04a90182 -r a26ed87f444c test-data/hisat_output_1_noqual.bam Binary file test-data/hisat_output_1_noqual.bam has changed