| Previous changeset 9:971e20519fb8 (2012-10-26) Next changeset 11:f320093f1e8e (2012-12-10) |
|
Commit message:
Version 0.3 - paried-end sorting is now built-in (uses Picard tools) |
|
modified:
htseq-count.xml test-data/htseq-test_counts.tsv test-data/htseq-test_othercounts.tsv tool_dependencies.xml |
|
added:
test-data/htseq-test-paired.bam test-data/htseq-test-paired_counts.tsv test-data/htseq-test-paired_othercounts.tsv |
| b |
| diff -r 971e20519fb8 -r 5d969cb56112 htseq-count.xml --- a/htseq-count.xml Fri Oct 26 15:57:08 2012 -0400 +++ b/htseq-count.xml Fri Dec 07 14:35:44 2012 -0500 |
| [ |
| @@ -1,10 +1,11 @@ -<tool id="htseq_count" name="htseq-count" version="0.2.1"> +<tool id="htseq_count" name="htseq-count" version="0.3"> <description> - Count aligned reads in a BAM file that overlap features in a GFF file</description> <version_command>htseq-count -h | grep version | sed 's/^\(.*\)*\(version .*\)\./\2/'</version_command> <requirements> <requirement type="package" version="1.6.2">numpy</requirement> <requirement type="package" version="0.5.3p9">htseq</requirement> <requirement type="package" version="0.1.18">samtools</requirement> + <requirement type="package" version="1.56.0">picard</requirement> </requirements> <command> ##set up input files @@ -17,9 +18,16 @@ #set $reference_fasta_filename = str( $samout_conditional.reference_source.ref_file.fields.path ) #end if #end if - - #if $samfile.extension == "bam": - samtools view $samfile | + #if str($singlepaired) == "paired": + ln -s $samfile local_input.sam && + java -Xmx2G -jar "\$JAVA_JAR_PATH/SortSam.jar" VALIDATION_STRINGENCY=LENIENT SORT_ORDER=queryname O=prepared_input.sam I=local_input.sam TMP_DIR="${__new_file_path__}" + || echo "Error running Picard MergeSamFiles" >&2 && + #else: + #if $samfile.extension == "bam": + samtools view $samfile | + #else + ln -s $samfile prepared_input.sam && + #end if #end if htseq-count --mode=$mode @@ -30,19 +38,26 @@ #if $samout_conditional.samout: --samout=$__new_file_path__/${samoutfile.id}_tmp #end if - #if $samfile.extension == "bam": - - - #else - $samfile - #end if + #if str($singlepaired) == "paired": + prepared_input.sam + #else: + #if $samfile.extension == "bam": + - + #else: + prepared_input.sam + #end if + #end if $gfffile | awk '{if ($1 ~ "no_feature|ambiguous|too_low_aQual|not_aligned|alignment_not_unique") print $0 | "cat 1>&2"; else print $0}' > $counts 2>$othercounts #if $samout_conditional.samout: && samtools view -Su -t ${reference_fasta_filename}.fai $__new_file_path__/${samoutfile.id}_tmp | samtools sort -o - sorted > $samoutfile #end if</command> <inputs> - <param format="sam, bam" name="samfile" type="data" label="Aligned SAM/BAM File"> - <help>Paired-End data MUST be sorted by QUERY NAME, use "NGS: Picard - Paired Read Mate Fixer" to sort by QUERY NAME and output to SAM (not BAM) before using this tool on paired data.</help> + <param format="sam, bam" name="samfile" type="data" label="Aligned SAM/BAM File"/> + <param name="singlepaired" type="select" label="Is this library mate-paired?"> + <help>Paired libraries will be sorted by read name prior to counting.</help> + <option value="single" selected="true">single-end</option> + <option value="paired">paired-end</option> </param> <param format="gff" name="gfffile" type="data" label="GFF File"/> <param name="mode" type="select" label="Mode"> @@ -93,9 +108,9 @@ </inputs> <outputs> - <data format="tabular" name="counts" label="${tool.name} on ${on_string}"/> - <data format="tabular" name="othercounts" label="${tool.name} on ${on_string} (no feature)"/> - <data format="bam" name="samoutfile" label="${tool.name} on ${on_string} (BAM)"> + <data format="tabular" name="counts" metadata_source="samfile" label="${tool.name} on ${on_string}"/> + <data format="tabular" name="othercounts" metadata_source="samfile" label="${tool.name} on ${on_string} (no feature)"/> + <data format="bam" name="samoutfile" metadata_source="samfile" label="${tool.name} on ${on_string} (BAM)"> <filter>samout_conditional['samout']</filter> </data> </outputs> @@ -107,6 +122,7 @@ <regex match="Error: Feature (.+) does not contain a '(.+)' attribute" source="both" level="fatal" description="Error parsing the GFF file, at least one feature of the specified 'Feature type' does not have a value for the specified 'ID Attribute'" /> <regex match="Error occured in line (\d+) of file" source="stderr" level="fatal" description="Unknown error parsing the GFF file" /> <regex match="Error" source="stderr" level="fatal" description="Unknown error occured" /> + <regex match="Warning: Read (.+) claims to have an aligned mate which could not be found. \(Is the SAM file properly sorted\?\)" source="stderr" level="warning" description="PAIRED DATA MISSING OR NOT PROPERLY SORTED. Try reruning and selecting the paired-end option. See stderr output of this dataset for more information." /> </stdio> <tests> @@ -124,6 +140,14 @@ <output name="counts" file="htseq-test_counts.tsv" /> <output name="othercounts" file="htseq-test_othercounts.tsv" /> </test> + <test> + <param name="samfile" value="htseq-test-paired.bam" /> + <param name="singlepaired" value="paired" /> + <param name="gfffile" value="htseq-test.gff" /> + <param name="samout" value="False" /> + <output name="counts" file="htseq-test-paired_counts.tsv" /> + <output name="othercounts" file="htseq-test-paired_othercounts.tsv" /> + </test> <!-- Seems to be an issue setting the $reference_fasta_filename variable during test <test> <param name="samfile" value="htseq-test.sam" /> |
| b |
| diff -r 971e20519fb8 -r 5d969cb56112 test-data/htseq-test-paired.bam |
| b |
| Binary file test-data/htseq-test-paired.bam has changed |
| b |
| diff -r 971e20519fb8 -r 5d969cb56112 test-data/htseq-test-paired_counts.tsv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/htseq-test-paired_counts.tsv Fri Dec 07 14:35:44 2012 -0500 |
| b |
| @@ -0,0 +1,127 @@ +HRA1 2 +YAL001C 12 +YAL002W 6 +YAL003W 5 +YAL004W 3 +YAL005C 5 +YAL007C 1 +YAL008W 0 +YAL009W 2 +YAL010C 3 +YAL011W 2 +YAL012W 3 +YAL013W 3 +YAL014C 5 +YAL015C 5 +YAL016C-A 0 +YAL016C-B 1 +YAL016W 2 +YAL017W 8 +YAL018C 5 +YAL019W 1 +YAL019W-A 0 +YAL020C 0 +YAL021C 10 +YAL022C 4 +YAL023C 5 +YAL024C 13 +YAL025C 1 +YAL026C 6 +YAL026C-A 0 +YAL027W 3 +YAL028W 3 +YAL029C 10 +YAL030W 1 +YAL031C 4 +YAL031W-A 2 +YAL032C 3 +YAL033W 2 +YAL034C 0 +YAL034C-B 2 +YAL034W-A 2 +YAL035W 7 +YAL036C 4 +YAL037C-A 0 +YAL037C-B 3 +YAL037W 1 +YAL038W 4 +YAL039C 1 +YAL040C 3 +YAL041W 8 +YAL042C-A 1 +YAL042W 5 +YAL043C 9 +YAL044C 0 +YAL044W-A 0 +YAL045C 0 +YAL046C 2 +YAL047C 2 +YAL047W-A 0 +YAL048C 7 +YAL049C 1 +YAL051W 3 +YAL053W 5 +YAL054C 2 +YAL055W 3 +YAL056C-A 0 +YAL056W 7 +YAL058W 4 +YAL059C-A 6 +YAL059W 4 +YAL060W 1 +YAL061W 4 +YAL062W 4 +YAL063C 0 +YAL063C-A 0 +YAL064C-A 0 +YAL064W 0 +YAL064W-B 0 +YAL065C 2 +YAL066W 0 +YAL067C 8 +YAL067W-A 1 +YAL068C 1 +YAL068W-A 0 +YAL069W 0 +YAR002C-A 0 +YAR002W 1 +YAR003W 4 +YAR007C 7 +YAR008W 0 +YAR009C 1 +YAR010C 0 +YAR014C 4 +YAR015W 4 +YAR018C 4 +YAR019C 4 +YAR019W-A 3 +YAR020C 0 +YAR023C 1 +YAR027W 0 +YAR028W 3 +YAR029W 0 +YAR030C 2 +YAR031W 4 +YAR033W 0 +YAR035C-A 0 +YAR035W 3 +YAR042W 4 +YAR047C 0 +YAR050W 4 +YAR053W 0 +YAR060C 2 +YAR061W 0 +YAR062W 2 +YAR064W 1 +YAR066W 2 +YAR068W 2 +YAR069C 1 +YAR070C 0 +YAR071W 4 +YAR073W 1 +YAR075W 0 +snR18 0 +tA(UGC)A 0 +tL(CAA)A 1 +tP(UGG)A 2 +tS(AGA)A 3 |
| b |
| diff -r 971e20519fb8 -r 5d969cb56112 test-data/htseq-test-paired_othercounts.tsv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/htseq-test-paired_othercounts.tsv Fri Dec 07 14:35:44 2012 -0500 |
| b |
| @@ -0,0 +1,5 @@ +no_feature 533 +ambiguous 1 +too_low_aQual 0 +not_aligned 0 +alignment_not_unique 0 |
| b |
| diff -r 971e20519fb8 -r 5d969cb56112 test-data/htseq-test_counts.tsv --- a/test-data/htseq-test_counts.tsv Fri Oct 26 15:57:08 2012 -0400 +++ b/test-data/htseq-test_counts.tsv Fri Dec 07 14:35:44 2012 -0500 |
| b |
| b'@@ -1,60 +1,4 @@\n-15S_rRNA\t0\n-21S_rRNA\t0\n HRA1\t0\n-LSR1\t0\n-NME1\t0\n-Q0010\t0\n-Q0017\t0\n-Q0032\t0\n-Q0045\t0\n-Q0050\t0\n-Q0055\t0\n-Q0060\t0\n-Q0065\t0\n-Q0070\t0\n-Q0075\t0\n-Q0080\t0\n-Q0085\t0\n-Q0092\t0\n-Q0105\t0\n-Q0110\t0\n-Q0115\t0\n-Q0120\t0\n-Q0130\t0\n-Q0140\t0\n-Q0142\t0\n-Q0143\t0\n-Q0144\t0\n-Q0160\t0\n-Q0182\t0\n-Q0250\t0\n-Q0255\t0\n-Q0275\t0\n-Q0297\t0\n-R0010W\t3\n-R0020C\t14\n-R0030W\t1\n-R0040C\t20\n-RDN18-1\t205\n-RDN18-2\t2\n-RDN25-1\t1408\n-RDN25-2\t59\n-RDN5-1\t0\n-RDN5-2\t1\n-RDN5-3\t0\n-RDN5-4\t0\n-RDN5-5\t3\n-RDN5-6\t0\n-RDN58-1\t85\n-RDN58-2\t1\n-RNA170\t0\n-RPM1\t0\n-RPR1\t0\n-RUF5-1\t0\n-RUF5-2\t0\n-SCR1\t0\n-SRG1\t1\n-TLC1\t0\n YAL001C\t3\n YAL002W\t2\n YAL003W\t31\n@@ -176,6949 +120,8 @@\n YAR071W\t1\n YAR073W\t0\n YAR075W\t0\n-YBL001C\t2\n-YBL002W\t6\n-YBL003C\t20\n-YBL004W\t8\n-YBL005W\t2\n-YBL005W-A\t0\n-YBL005W-B\t3\n-YBL006C\t1\n-YBL006W-A\t0\n-YBL007C\t4\n-YBL008W\t2\n-YBL008W-A\t0\n-YBL009W\t3\n-YBL010C\t1\n-YBL011W\t4\n-YBL012C\t0\n-YBL013W\t0\n-YBL014C\t0\n-YBL015W\t0\n-YBL016W\t0\n-YBL017C\t2\n-YBL018C\t2\n-YBL019W\t0\n-YBL020W\t0\n-YBL021C\t0\n-YBL022C\t11\n-YBL023C\t0\n-YBL024W\t11\n-YBL025W\t0\n-YBL026W\t0\n-YBL027W\t92\n-YBL028C\t5\n-YBL029C-A\t0\n-YBL029W\t0\n-YBL030C\t6\n-YBL031W\t1\n-YBL032W\t7\n-YBL033C\t1\n-YBL034C\t2\n-YBL035C\t2\n-YBL036C\t1\n-YBL037W\t3\n-YBL038W\t3\n-YBL039C\t6\n-YBL039C-A\t0\n-YBL039W-B\t0\n-YBL040C\t0\n-YBL041W\t9\n-YBL042C\t4\n-YBL043W\t0\n-YBL044W\t0\n-YBL045C\t3\n-YBL046W\t2\n-YBL047C\t6\n-YBL048W\t0\n-YBL049W\t0\n-YBL050W\t1\n-YBL051C\t6\n-YBL052C\t2\n-YBL053W\t0\n-YBL054W\t0\n-YBL055C\t0\n-YBL056W\t7\n-YBL057C\t5\n-YBL058W\t5\n-YBL059C-A\t4\n-YBL059W\t0\n-YBL060W\t1\n-YBL061C\t2\n-YBL062W\t0\n-YBL063W\t2\n-YBL064C\t1\n-YBL065W\t0\n-YBL066C\t0\n-YBL067C\t4\n-YBL068W\t1\n-YBL068W-A\t0\n-YBL069W\t1\n-YBL070C\t0\n-YBL071C\t0\n-YBL071C-B\t0\n-YBL071W-A\t4\n-YBL072C\t24\n-YBL073W\t0\n-YBL074C\t0\n-YBL075C\t0\n-YBL076C\t18\n-YBL077W\t0\n-YBL078C\t1\n-YBL079W\t2\n-YBL080C\t0\n-YBL081W\t3\n-YBL082C\t0\n-YBL083C\t0\n-YBL084C\t0\n-YBL085W\t2\n-YBL086C\t4\n-YBL087C\t6\n-YBL088C\t2\n-YBL089W\t1\n-YBL090W\t2\n-YBL091C\t2\n-YBL091C-A\t0\n-YBL092W\t30\n-YBL093C\t1\n-YBL094C\t0\n-YBL095W\t2\n-YBL096C\t0\n-YBL097W\t2\n-YBL098W\t1\n-YBL099W\t3\n-YBL100C\t0\n-YBL100W-A\t0\n-YBL100W-B\t1\n-YBL100W-C\t0\n-YBL101C\t2\n-YBL102W\t1\n-YBL103C\t0\n-YBL104C\t3\n-YBL105C\t5\n-YBL106C\t1\n-YBL107C\t4\n-YBL107W-A\t0\n-YBL108C-A\t0\n-YBL108W\t0\n-YBL109W\t0\n-YBL111C\t0\n-YBL112C\t0\n-YBL113C\t2\n-YBL113W-A\t0\n-YBR001C\t3\n-YBR002C\t0\n-YBR003W\t3\n-YBR004C\t1\n-YBR005W\t0\n-YBR006W\t0\n-YBR007C\t3\n-YBR008C\t0\n-YBR009C\t23\n-YBR010W\t16\n-YBR011C\t17\n-YBR012C\t0\n-YBR012W-A\t0\n-YBR012W-B\t7\n-YBR013C\t0\n-YBR014C\t1\n-YBR015C\t5\n-YBR016W\t0\n-YBR017C\t4\n-YBR018C\t0\n-YBR019C\t0\n-YBR020W\t0\n-YBR021W\t0\n-YBR022W\t3\n-YBR023C\t2\n-YBR024W\t1\n-YBR025C\t17\n-YBR026C\t0\n-YBR027C\t0\n-YBR028C\t3\n-YBR029C\t3\n-YBR030W\t0\n-YBR031W\t65\n-YBR032W\t0\n-YBR033W\t0\n-YBR034C\t4\n-YBR035C\t2\n-YBR036C\t2\n-YBR037C\t1\n-YBR038W\t2\n-YBR039W\t10\n-YBR040W\t0\n-YBR041W\t1\n-YBR042C\t0\n-YBR043C\t1\n-YBR044C\t0\n-YBR045C\t0\n-YBR046C\t1\n-YBR047W\t0\n-YBR048W\t35\n-YBR049C\t9\n-YBR050C\t0\n-YBR051W\t0\n-YBR052C\t4\n-YBR053C\t2\n-YBR054W\t2\n-YBR055C\t1\n-YBR056C-B\t0\n-YBR056W\t3\n-YBR056W-A\t0\n-YBR057C\t3\n-YBR058C\t1\n-YBR058C-A\t0\n-YBR059C\t4\n-YBR060C\t6\n-YBR061C\t2\n-YBR062C\t0\n-YBR063C\t1\n-YBR064W\t0\n-YBR065C\t0\n-YBR066C\t1\n-YBR067C\t0\n-YBR068C\t2\n-YBR069C\t1\n-YBR070C\t0\n-YBR071W\t1\n-YBR072C-A\t0\n-YBR072W\t0\n-YBR073W\t0\n-YBR074W\t5\n-YBR076C-A\t0\n-YBR076W\t0\n-YBR077C\t0\n-YBR078W\t12\n-YBR079C\t7\n-YBR080C\t1\n-YBR081C\t1\n-YBR082C\t10\n-YBR083W\t1\n-YBR084C-A\t56\n-YBR084W\t16\n-YBR085C-A\t0\n-YBR085W\t1\n-YBR086C\t8\n-YBR087W\t1\n-YBR088C\t2\n-YBR089C-A\t0\n-YBR089W\t0\n-YBR090C\t0\n-YBR091C\t0\n-YBR092C\t0\n-YBR093C\t0\n-YBR094W\t4\n-YBR095C\t2\n-YBR096W\t0\n-YBR097W\t0\n-YBR098W\t0\n-YBR099C\t0\n-YBR101C\t3\n-YBR102C\t1\n-YBR103C-A\t0\n-YBR103W\t1\n-YBR104W\t0\n-YBR105C\t5\n-YBR106W\t8\n-YBR107C\t0\n-YBR108W\t1\n-YBR109C\t8\n-YBR109W-A\t0\n-YBR110W\t2\n-YBR111C\t4\n-YBR111W-A\t0\n-YBR112C\t6\n-YBR113W\t0\n-YBR114W\t1\n-YBR115C\t4\n-YBR116C\t0\n-YBR117C\t0\n-YBR118W\t143\n-YBR119W\t1\n-YBR120C\t1\n-YBR121C\t11\n-YBR121C-A\t0\n-YBR122C\t4\n-YBR123C\t6\n-YBR124W\t0\n-YBR125C\t0\n-YBR126C\t6\n-YBR126W-A\t13\n-YBR126W-B\t0\n-YBR127C\t24\n-YBR128C\t0\n-YBR129C\t0\n-YBR130C\t0\n-YBR131C-A\t0\n-YBR131W\t0\n-YBR132C\t0\n-YBR133C\t2\n-YBR134W\t0\n-YBR135W\t0\n-YBR136W\t1\n-YBR137W\t1\n-YBR138C\t2\n-YBR139W\t1\n-YBR140C\t2\n-YBR141C\t0\n-YBR141W-A\t0\n-YBR142W\t9\n-YBR143C\t8\n-YBR144C\t0\n-YBR145W\t0\n-YBR146W\t1\n-YBR147W\t0\n-YBR148W\t0\n-YBR149W\t7\n-YBR150'..b'\n-snR61\t0\n-snR62\t0\n-snR63\t1\n-snR64\t2\n-snR65\t0\n-snR66\t0\n-snR67\t0\n-snR68\t0\n-snR69\t1\n-snR7-L\t0\n-snR7-S\t0\n-snR70\t0\n-snR71\t0\n-snR72\t0\n-snR73\t0\n-snR74\t0\n-snR75\t0\n-snR76\t1\n-snR77\t1\n-snR78\t0\n-snR79\t0\n-snR8\t0\n-snR80\t0\n-snR81\t0\n-snR82\t0\n-snR83\t0\n-snR84\t0\n-snR85\t0\n-snR86\t1\n-snR87\t0\n-snR9\t1\n-tA(AGC)D\t0\n-tA(AGC)F\t0\n-tA(AGC)G\t0\n-tA(AGC)H\t0\n-tA(AGC)J\t0\n-tA(AGC)K1\t0\n-tA(AGC)K2\t0\n-tA(AGC)L\t0\n-tA(AGC)M1\t0\n-tA(AGC)M2\t0\n-tA(AGC)P\t0\n tA(UGC)A\t0\n-tA(UGC)E\t0\n-tA(UGC)G\t0\n-tA(UGC)L\t0\n-tA(UGC)O\t0\n-tA(UGC)Q\t0\n-tC(GCA)B\t0\n-tC(GCA)G\t0\n-tC(GCA)P1\t0\n-tC(GCA)P2\t0\n-tC(GCA)Q\t0\n-tD(GUC)B\t0\n-tD(GUC)D\t0\n-tD(GUC)G1\t0\n-tD(GUC)G2\t0\n-tD(GUC)I1\t0\n-tD(GUC)I2\t0\n-tD(GUC)J1\t0\n-tD(GUC)J2\t0\n-tD(GUC)J3\t0\n-tD(GUC)J4\t0\n-tD(GUC)K\t0\n-tD(GUC)L1\t0\n-tD(GUC)L2\t0\n-tD(GUC)M\t0\n-tD(GUC)N\t0\n-tD(GUC)O\t0\n-tD(GUC)Q\t0\n-tE(CUC)D\t0\n-tE(CUC)I\t0\n-tE(UUC)B\t0\n-tE(UUC)C\t0\n-tE(UUC)E1\t0\n-tE(UUC)E2\t0\n-tE(UUC)E3\t0\n-tE(UUC)G1\t0\n-tE(UUC)G2\t0\n-tE(UUC)G3\t0\n-tE(UUC)I\t0\n-tE(UUC)J\t0\n-tE(UUC)K\t0\n-tE(UUC)L\t0\n-tE(UUC)M\t0\n-tE(UUC)P\t0\n-tE(UUC)Q\t0\n-tF(GAA)B\t0\n-tF(GAA)D\t0\n-tF(GAA)F\t0\n-tF(GAA)G\t0\n-tF(GAA)H1\t0\n-tF(GAA)H2\t0\n-tF(GAA)M\t0\n-tF(GAA)N\t0\n-tF(GAA)P1\t0\n-tF(GAA)P2\t0\n-tF(GAA)Q\t0\n-tG(CCC)D\t0\n-tG(CCC)O\t0\n-tG(GCC)B\t0\n-tG(GCC)C\t0\n-tG(GCC)D1\t0\n-tG(GCC)D2\t0\n-tG(GCC)E\t0\n-tG(GCC)F1\t0\n-tG(GCC)F2\t0\n-tG(GCC)G1\t0\n-tG(GCC)G2\t0\n-tG(GCC)J1\t0\n-tG(GCC)J2\t0\n-tG(GCC)M\t0\n-tG(GCC)O1\t0\n-tG(GCC)O2\t0\n-tG(GCC)P1\t0\n-tG(GCC)P2\t0\n-tG(UCC)G\t0\n-tG(UCC)N\t0\n-tG(UCC)O\t0\n-tG(UCC)Q\t0\n-tH(GUG)E1\t0\n-tH(GUG)E2\t0\n-tH(GUG)G1\t0\n-tH(GUG)G2\t0\n-tH(GUG)H\t0\n-tH(GUG)K\t0\n-tH(GUG)M\t0\n-tH(GUG)Q\t0\n-tI(AAU)B\t0\n-tI(AAU)D\t0\n-tI(AAU)E1\t0\n-tI(AAU)E2\t0\n-tI(AAU)G\t0\n-tI(AAU)I1\t0\n-tI(AAU)I2\t0\n-tI(AAU)L1\t0\n-tI(AAU)L2\t0\n-tI(AAU)N1\t0\n-tI(AAU)N2\t0\n-tI(AAU)P1\t0\n-tI(AAU)P2\t0\n-tI(GAU)Q\t0\n-tI(UAU)D\t0\n-tI(UAU)L\t0\n-tK(CUU)C\t0\n-tK(CUU)D1\t0\n-tK(CUU)D2\t0\n-tK(CUU)E1\t0\n-tK(CUU)E2\t0\n-tK(CUU)F\t0\n-tK(CUU)G1\t0\n-tK(CUU)G2\t0\n-tK(CUU)G3\t0\n-tK(CUU)I\t0\n-tK(CUU)J\t0\n-tK(CUU)K\t0\n-tK(CUU)M\t0\n-tK(CUU)P\t0\n-tK(UUU)D\t0\n-tK(UUU)G1\t0\n-tK(UUU)G2\t0\n-tK(UUU)K\t0\n-tK(UUU)L\t0\n-tK(UUU)O\t0\n-tK(UUU)P\t0\n-tK(UUU)Q\t0\n tL(CAA)A\t0\n-tL(CAA)C\t0\n-tL(CAA)D\t0\n-tL(CAA)G1\t0\n-tL(CAA)G2\t0\n-tL(CAA)G3\t0\n-tL(CAA)K\t0\n-tL(CAA)L\t0\n-tL(CAA)M\t0\n-tL(CAA)N\t0\n-tL(GAG)G\t0\n-tL(UAA)B1\t0\n-tL(UAA)B2\t0\n-tL(UAA)D\t0\n-tL(UAA)J\t0\n-tL(UAA)K\t0\n-tL(UAA)L\t0\n-tL(UAA)N\t0\n-tL(UAA)Q\t0\n-tL(UAG)J\t0\n-tL(UAG)L1\t0\n-tL(UAG)L2\t0\n-tM(CAU)C\t0\n-tM(CAU)D\t0\n-tM(CAU)E\t0\n-tM(CAU)J1\t0\n-tM(CAU)J2\t0\n-tM(CAU)J3\t0\n-tM(CAU)M\t0\n-tM(CAU)O1\t0\n-tM(CAU)O2\t0\n-tM(CAU)P\t0\n-tM(CAU)Q1\t0\n-tM(CAU)Q2\t0\n-tN(GUU)C\t0\n-tN(GUU)F\t0\n-tN(GUU)G\t0\n-tN(GUU)K\t0\n-tN(GUU)L\t0\n-tN(GUU)N1\t0\n-tN(GUU)N2\t0\n-tN(GUU)O1\t0\n-tN(GUU)O2\t0\n-tN(GUU)P\t0\n-tN(GUU)Q\t0\n-tP(AGG)C\t0\n-tP(AGG)N\t0\n tP(UGG)A\t0\n-tP(UGG)F\t0\n-tP(UGG)H\t0\n-tP(UGG)L\t0\n-tP(UGG)M\t0\n-tP(UGG)N1\t0\n-tP(UGG)N2\t0\n-tP(UGG)O1\t0\n-tP(UGG)O2\t0\n-tP(UGG)O3\t0\n-tP(UGG)Q\t0\n-tQ(CUG)M\t0\n-tQ(UUG)B\t0\n-tQ(UUG)C\t0\n-tQ(UUG)D1\t0\n-tQ(UUG)D2\t0\n-tQ(UUG)D3\t0\n-tQ(UUG)E1\t0\n-tQ(UUG)E2\t0\n-tQ(UUG)H\t0\n-tQ(UUG)L\t0\n-tQ(UUG)Q\t0\n-tR(ACG)D\t0\n-tR(ACG)E\t0\n-tR(ACG)J\t0\n-tR(ACG)K\t0\n-tR(ACG)L\t0\n-tR(ACG)O\t0\n-tR(ACG)Q2\t0\n-tR(CCG)L\t0\n-tR(CCU)J\t0\n-tR(UCU)B\t0\n-tR(UCU)D\t0\n-tR(UCU)E\t0\n-tR(UCU)G1\t0\n-tR(UCU)G2\t0\n-tR(UCU)G3\t0\n-tR(UCU)J1\t0\n-tR(UCU)J2\t0\n-tR(UCU)K\t0\n-tR(UCU)M1\t0\n-tR(UCU)M2\t0\n-tR(UCU)Q1\t0\n tS(AGA)A\t0\n-tS(AGA)B\t0\n-tS(AGA)D1\t0\n-tS(AGA)D2\t0\n-tS(AGA)D3\t0\n-tS(AGA)E\t0\n-tS(AGA)G\t0\n-tS(AGA)H\t0\n-tS(AGA)J\t0\n-tS(AGA)L\t0\n-tS(AGA)M\t0\n-tS(CGA)C\t0\n-tS(GCU)F\t0\n-tS(GCU)L\t0\n-tS(GCU)O\t0\n-tS(GCU)Q1\t0\n-tS(UGA)E\t0\n-tS(UGA)I\t0\n-tS(UGA)P\t0\n-tS(UGA)Q2\t0\n-tT(AGU)B\t0\n-tT(AGU)C\t0\n-tT(AGU)D\t0\n-tT(AGU)H\t0\n-tT(AGU)I1\t0\n-tT(AGU)I2\t0\n-tT(AGU)J\t0\n-tT(AGU)N1\t0\n-tT(AGU)N2\t0\n-tT(AGU)O1\t0\n-tT(AGU)O2\t0\n-tT(CGU)K\t0\n-tT(UGU)G1\t0\n-tT(UGU)G2\t0\n-tT(UGU)H\t0\n-tT(UGU)P\t0\n-tT(UGU)Q1\t0\n-tT(XXX)Q2\t0\n-tV(AAC)E1\t0\n-tV(AAC)E2\t0\n-tV(AAC)G1\t0\n-tV(AAC)G2\t0\n-tV(AAC)G3\t0\n-tV(AAC)H\t0\n-tV(AAC)J\t0\n-tV(AAC)K1\t0\n-tV(AAC)K2\t0\n-tV(AAC)L\t0\n-tV(AAC)M1\t0\n-tV(AAC)M2\t0\n-tV(AAC)M3\t0\n-tV(AAC)O\t0\n-tV(CAC)D\t0\n-tV(CAC)H\t0\n-tV(UAC)B\t0\n-tV(UAC)D\t0\n-tV(UAC)Q\t0\n-tW(CCA)G1\t0\n-tW(CCA)G2\t0\n-tW(CCA)J\t0\n-tW(CCA)K\t0\n-tW(CCA)M\t0\n-tW(CCA)P\t0\n-tW(UCA)Q\t0\n-tX(XXX)D\t0\n-tY(GUA)D\t0\n-tY(GUA)F1\t0\n-tY(GUA)F2\t0\n-tY(GUA)J1\t0\n-tY(GUA)J2\t0\n-tY(GUA)M1\t0\n-tY(GUA)M2\t0\n-tY(GUA)O\t0\n-tY(GUA)Q\t0\n' |
| b |
| diff -r 971e20519fb8 -r 5d969cb56112 test-data/htseq-test_othercounts.tsv --- a/test-data/htseq-test_othercounts.tsv Fri Oct 26 15:57:08 2012 -0400 +++ b/test-data/htseq-test_othercounts.tsv Fri Dec 07 14:35:44 2012 -0500 |
| b |
| @@ -1,5 +1,5 @@ -no_feature 1437 -ambiguous 67 +no_feature 19 +ambiguous 0 too_low_aQual 0 not_aligned 1336 alignment_not_unique 0 |
| b |
| diff -r 971e20519fb8 -r 5d969cb56112 tool_dependencies.xml --- a/tool_dependencies.xml Fri Oct 26 15:57:08 2012 -0400 +++ b/tool_dependencies.xml Fri Dec 07 14:35:44 2012 -0500 |
| b |
| @@ -55,4 +55,20 @@ Compiling SAMtools requires the ncurses and zlib development libraries. </readme> </package> + <package name="picard" version="1.56.0"> + <install version="1.0"> + <actions> + <action type="download_by_url">http://downloads.sourceforge.net/project/picard/picard-tools/1.56/picard-tools-1.56.zip</action> + <action type="move_directory_files"> + <source_directory>picard-tools-1.56</source_directory> + <destination_directory>$INSTALL_DIR/jars</destination_directory> + </action> + <action type="set_environment"> + <environment_variable name="JAVA_JAR_PATH" action="set_to">$INSTALL_DIR/jars</environment_variable> + </action> + </actions> + </install> + <readme> + </readme> + </package> </tool_dependency> |