Galaxy |

Changeset 8:62ca6da715bf (2019-02-21)

Previous changeset 7:f430a1ec7ee4 (2017-12-12) Next changeset 9:398d2ccc4233 (2019-06-05)

Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/bcftools commit 2684e1443f03bfe2ae20c31d23817415ec8f7e69

modified:
bcftools_concat.xml
macros.xml
test-data/view.bcf

added:
test-data/summary.pdf
test-data/view.vcf_bgzip

removed:
test-data/view.bcf.csi

diff -r f430a1ec7ee4 -r 62ca6da715bf bcftools_concat.xml
--- a/bcftools_concat.xml Tue Dec 12 14:03:19 2017 -0500
+++ b/bcftools_concat.xml Thu Feb 21 16:06:33 2019 -0500

[

b'@@ -1,5 +1,5 @@\n <?xml version=\'1.0\' encoding=\'utf-8\'?>\n-<tool name="bcftools @EXECUTABLE@" id="bcftools_@EXECUTABLE@" version="@VERSION@.1">\n+<tool name="bcftools @EXECUTABLE@" id="bcftools_@EXECUTABLE@" version="@TOOL_VERSION@">\n <description>Concatenate or combine VCF/BCF files</description>\n <macros>\n <token name="@EXECUTABLE@">concat</token>\n@@ -19,19 +19,19 @@\n #set $section = $sec_default\n \n #if $section.mode.naive == "yes":\n- --naive\n-#else: \n- #if $section.mode.overlaps.allow_overlaps == \'yes\':\n- --allow-overlaps\n- #if $section.mode.overlaps.rm_dups:\n- --rm-dups $section.mode.overlaps.rm_dups\n+ --naive\n+#else:\n+ #if $section.mode.overlaps.allow_overlaps == \'yes\':\n+ --allow-overlaps\n+ #if $section.mode.overlaps.rm_dups:\n+ --rm-dups $section.mode.overlaps.rm_dups\n+ #end if\n #end if\n- #end if\n- ${section.mode.ligate}\n+ ${section.mode.ligate}\n #end if\n ${section.compact_PS}\n-#if $section.min_PQ:\n- --min-PQ "${section.min_PQ}"\n+#if str($section.min_PQ):\n+ --min-PQ ${section.min_PQ}\n #end if\n \n #set $section = $sec_restrict\n@@ -41,14 +41,13 @@\n @THREADS@\n \n ## Primary Input/Outputs\n-@INPUT_FILES@ \n+@INPUT_FILES@\n #if $sec_default.mode.naive == "yes" and $output_type == \'v\':\n-> output.gz && bcftools index output.gz && bcftools view -O v -o \'$output_file\' output.gz\n+ > output.gz && bcftools index output.gz && bcftools view -O v -o \'$output_file\' output.gz\n #else:\n-> \'$output_file\'\n+ > \'$output_file\'\n #end if\n-]]>\n- </command>\n+ ]]></command>\n <inputs>\n <expand macro="macro_inputs" />\n <section name="sec_restrict" expanded="false" title="Restrict to">\n@@ -56,9 +55,9 @@\n </section>\n <section name="sec_default" expanded="true" title="Concat Options">\n <conditional name="mode">\n- <param name="naive" type="select" label="naive concat"> \n+ <param name="naive" type="select" label="naive concat">\n <help><![CDATA[\n---naive concatenates VCF or BCF files without recompression. This can be used used to combine results that were generated separately for each chromosome. This is very fast but requires that all files are of the same type (all VCF or all BCF) and have the same headers. This is because all tags and chromosome names in the BCF body rely on the implicit order of the contig and tag definitions in the header. Currently no sanity checks are in place. Dangerous, use with caution. \n+--naive concatenates VCF or BCF files without recompression. This can be used used to combine results that were generated separately for each chromosome. This is very fast but requires that all files are of the same type (all VCF or all BCF) and have the same headers. This is because all tags and chromosome names in the BCF body rely on the implicit order of the contig and tag definitions in the header. Currently no sanity checks are in place. Dangerous, use with caution.\n ]]></help>\n <option value="no">No </option>\n <option value="yes">Yes </option>\n@@ -66,17 +65,17 @@\n <when value="yes"/>\n <when value="no">\n <conditional name="overlaps">\n- <param name="allow_overlaps" type="select" label="Allow Overlaps"> \n+ <param name="allow_overlaps" type="select" label="Allow Overlaps">\n <help>\n- First coordinate of the next file can precede last record of the current file. \n+ First coordinate of the next file can precede last record of the current file.\n </help>\n <option value="yes">Yes </option>\n <option value="no">No </option>\n </param>\n <when value="yes">\n- <param name="rm_dup'..b'y once: \n+ Output duplicate records present in multiple files only once:\n rm-dups <snps|indels|both|all|none>\n ]]></help>\n <option value="snps">snps - SNP records</option>\n@@ -88,13 +87,13 @@\n </when>\n <when value="no"/>\n </conditional>\n- <param name="ligate" type="boolean" truevalue="--ligate" falsevalue="" label="Ligate" \n+ <param name="ligate" type="boolean" truevalue="--ligate" falsevalue="" label="Ligate"\n help="Ligate phased VCFs by matching phase at overlapping haplotypes" />\n </when>\n </conditional>\n- <param name="compact_PS" type="boolean" truevalue="--compact-PS" falsevalue="" label="Compact Ps" \n+ <param name="compact_PS" type="boolean" truevalue="--compact-PS" falsevalue="" label="Compact Ps"\n help="Do not output PS tag at each site, only at the start of a new phase set block." />\n- <param name="min_PQ" type="integer" label="Min Pq" value="30" optional="True" \n+ <param name="min_PQ" type="integer" label="Min Pq" value="30" optional="true"\n help="Break phase set if phasing quality is lower than <int>" />\n </section>\n <expand macro="macro_select_output_type" />\n@@ -103,7 +102,7 @@\n <expand macro="macro_vcf_output"/>\n </outputs>\n <tests>\n- <test>\n+ <test>\n <param name="input_files" ftype="vcf" value="concat.1.b.vcf,concat.1.a.vcf" />\n <param name="output_type" value="v" />\n <output name="output_file">\n@@ -112,8 +111,8 @@\n <has_text_matching expression="3\\t192"/>\n </assert_contents>\n </output>\n- </test>\n- <test>\n+ </test>\n+ <test>\n <param name="input_files" ftype="vcf" value="concat.1.b.vcf,concat.1.a.vcf" />\n <param name="naive" value="yes" />\n <param name="output_type" value="v" />\n@@ -123,8 +122,8 @@\n <has_text_matching expression="3\\t192"/>\n </assert_contents>\n </output>\n- </test>\n- <test>\n+ </test>\n+ <test>\n <param name="input_files" ftype="vcf" value="concat.2.b.vcf,concat.2.a.vcf" />\n <param name="allow_overlaps" value="yes" />\n <param name="output_type" value="v" />\n@@ -135,7 +134,7 @@\n </assert_contents>\n </output>\n </test>\n- <test>\n+ <test>\n <param name="input_files" ftype="vcf" value="concat.2.b.vcf,concat.2.a.vcf" />\n <param name="allow_overlaps" value="yes" />\n <param name="rm_dups" value="none" />\n@@ -155,7 +154,7 @@\n Concatenate or combine VCF/BCF files. All source files must have the same sample columns appearing in the same order. The program can be used, for example, to concatenate chromosome VCFs into one VCF, or combine a SNP VCF and an indel VCF into one. The input files must be sorted by chr and position. The files must be given in the correct order to produce sorted VCF on output unless the -a, --allow-overlaps option is specified.\n \n \n-Naive concatenation is useful when using a galaxy workflow that splits a BAM file by chromosome, processes each in parallel, then bcftools concat merges the results into a single VCF file: \n+Naive concatenation is useful when using a galaxy workflow that splits a BAM file by chromosome, processes each in parallel, then bcftools concat merges the results into a single VCF file:\n \n BAM -> bamtools split => bcftools mpileup => bcftools call => bcftools concat -> VCF\n \n@@ -165,7 +164,6 @@\n @BCFTOOLS_MANPAGE@#@EXECUTABLE@\n \n @BCFTOOLS_WIKI@\n-]]>\n- </help>\n+ ]]></help>\n <expand macro="citations" />\n </tool>\n'

diff -r f430a1ec7ee4 -r 62ca6da715bf macros.xml
--- a/macros.xml Tue Dec 12 14:03:19 2017 -0500
+++ b/macros.xml Thu Feb 21 16:06:33 2019 -0500

[

b'@@ -1,5 +1,5 @@\n <macros>\n- <token name="@VERSION@">1.4.0</token>\n+ <token name="@TOOL_VERSION@">1.9</token>\n <xml name="stdio">\n <stdio>\n <exit_code range="1:" />\n@@ -10,13 +10,13 @@\n </xml>\n <xml name="requirements">\n <requirements>\n- <requirement type="package" version="1.4">bcftools</requirement>\n- <requirement type="package" version="1.4">htslib</requirement>\n+ <requirement type="package" version="@TOOL_VERSION@">bcftools</requirement>\n+ <requirement type="package" version="1.9">htslib</requirement>\n <yield />\n </requirements>\n </xml>\n <xml name="samtools_requirement">\n- <requirement type="package" version="1.3.1">samtools</requirement>\n+ <requirement type="package" version="1.9">samtools</requirement>\n </xml>\n <xml name="version_command">\n <version_command>bcftools 2>&1 | grep \'Version:\'</version_command>\n@@ -39,7 +39,7 @@\n ]]>\n </token>\n <xml name="macro_input">\n- <param name="input_file" type="data" format="vcf,vcf_bgzip,bcf,bcf_bgzip" label="VCF/BCF Data" />\n+ <param name="input_file" type="data" format="vcf,vcf_bgzip,bcf" label="VCF/BCF Data" />\n </xml>\n <token name="@PREPARE_INPUT_FILE@">\n <![CDATA[\n@@ -50,6 +50,11 @@\n bcftools index $input_vcf &&\n #elif $input_file.is_of_type(\'vcf_bgzip\')\n ln -s \'$input_file\' $input_vcf &&\n+ #if $input_file.metadata.tabix_index:\n+ ln -s \'${input_file.metadata.tabix_index}\' ${input_vcf}.tbi &&\n+ #else\n+ bcftools index $input_vcf &&\n+ #end if\n #elif $input_file.is_of_type(\'bcf\')\n #set $input_vcf = \'input.bcf\'\n ln -s \'$input_file\' $input_vcf &&\n@@ -58,8 +63,6 @@\n #else\n bcftools index $input_vcf &&\n #end if\n-#elif $input_file.is_of_type(\'bcf_bgzip\')\n- ln -s \'$input_file\' $input_vcf &&\n #end if\n ]]>\n </token>\n@@ -68,7 +71,7 @@\n </token>\n \n <xml name="macro_inputs">\n- <param name="input_files" type="data" format="vcf,bcf" label="Other VCF/BCF Datasets" multiple="True" />\n+ <param name="input_files" type="data" format="vcf,vcf_bgzip,bcf" label="Other VCF/BCF Datasets" multiple="True" />\n </xml>\n <token name="@PREPARE_INPUT_FILES@">\n <![CDATA[\n@@ -80,8 +83,13 @@\n #if $input_file.is_of_type(\'vcf\')\n bgzip -c \'$input_file\' > $input_vcf &&\n bcftools index $input_vcf &&\n- #elif $input_file.is_of_type(\'vcf_bgz\')\n- ln -s \'$input_file\' $input_vcf\n+ #elif $input_file.is_of_type(\'vcf_bgzip\')\n+ ln -s \'$input_file\' $input_vcf &&\n+ #if $input_file.metadata.tabix_index:\n+ ln -s \'${input_file.metadata.tabix_index}\' ${input_vcf}.tbi &&\n+ #else\n+ bcftools index $input_vcf &&\n+ #end if\n #elif $input_file.is_of_type(\'bcf\')\n #set $input_vcf = \'input\' + str($i) + \'.bcf.gz\'\n ln -s \'$input_file\' $input_vcf &&\n@@ -90,8 +98,6 @@\n #else\n bcftools index $input_vcf &&\n #end if\n- #elif $input_file.is_of_type(\'bcfvcf_bgz\')\n- ln -s \'$input_file\' $input_vcf &&\n #end if\n echo \'$input_vcf\' >> $vcfs_list_file &&\n $input_vcfs.append($input_vcf)\n@@ -106,7 +112,7 @@\n </token>\n \n <xml name="macro_fasta_ref">\n- <param name="fasta_ref" argument="--fasta-ref" type="data" format="data" label="Reference sequence in FASTA format" optional="True" />\n+ <param name="fasta_ref" argument="--fasta-ref" type="data" format="data" optional="true" label="Reference sequence in FASTA format" />\n </xml>\n <token name="@PREPARE_FASTA_REF@">\n <![CDATA[\n@@ -148,7 +154,7 @@\n \n \n <xml name="macro_AF_file">\n- <param name="AF_file" argument="--AF-file" type="data" format="tabular" label="Allele frequencies file" optional="True" help="Tab-delimited file containing the columns CHR,POS,REF,ALT,AF" />\n+ <param name="AF_file" argument="--AF-file" type="data" format="tabular" optional="true" label="Allele frequencies file" help="Tab-delimited file containing the columns CHR,POS,REF,ALT,AF" />\n </xml>\n \n <token name="@PREPARE_AF_FILE@">\n@@ -165,7 +171,7 @@\n </token>\n \n <xml '..b'ne__"/>\n <when value="targets">\n- <param name="targets" type="text" value="" label="Restrict to comma-separated list of targets" optional="true"\n+ <param name="targets" type="text" value="" optional="true" label="Restrict to comma-separated list of targets"\n help="Each target is specifed as: chr or chr:pos or chr:from-to">\n <validator type="regex" message="">^(\\w+(:\\d+(-\\d+)?)?(,\\w+(:\\d+(-\\d+)?)?)*)?$</validator>\n </param>\n@@ -373,16 +379,16 @@\n </token>\n \n <xml name="macro_samples">\n- <param name="samples" type="text" value="" label="Samples" optional="true"\n- help="(-s) comma separated list of samples to annotate (or exclude)">\n+ <param argument="--samples" type="text" value="" optional="true" label="Samples"\n+ help="Comma separated list of samples to annotate (or exclude)">\n <validator type="regex" message="">^(\\w+(,\\w+)*)?$</validator>\n </param>\n <param name="invert_samples" type="boolean" truevalue="^" falsevalue="" checked="false" label="Invert Samples"\n- help="inverts the query/filtering applied by Samples (adds "^" prefix to exclude)" />\n- <param name="samples_file" type="data" format="tabular" label="Samples File" optional="True"\n- help="(-S) file of samples to include" />\n- <param name="invert_samples_file" type="boolean" truevalue="^" falsevalue="" checked="false" label="Invert Samples File"\n- help="inverts the query/filtering applied by Samples File" />\n+ help="Inverts the query/filtering applied by Samples (adds "^" prefix to exclude)" />\n+ <param argument="--samples_file" type="data" format="tabular" optional="true" label="Samples file"\n+ help="File of samples to include" />\n+ <param name="invert_samples_file" type="boolean" truevalue="^" falsevalue="" checked="false" label="Invert Samples file"\n+ help="inverts the query/filtering applied by Samples file" />\n </xml>\n <token name="@SAMPLES@">\n #set $samples_defined = False\n@@ -397,7 +403,7 @@\n </token>\n \n <xml name="macro_sample">\n- <param name="sample" type="text" label="Sample" optional="True" help="apply variants of the given sample" />\n+ <param name="sample" type="text" optional="true" label="Sample" help="Apply variants of the given sample" />\n </xml>\n <token name="@SAMPLE@">\n #if $section.sample:\n@@ -407,7 +413,7 @@\n \n \n <xml name="macro_include">\n- <param name="include" type="text" label="Include" optional="True" help="(-i) select sites for which the expression is true">\n+ <param argument="--include" type="text" optional="true" label="Include" help="Select sites for which the expression is true">\n <validator type="regex" message="Single quote not allowed">^[^\']*$</validator>\n <sanitizer sanitize="False"/>\n </param>\n@@ -419,7 +425,7 @@\n </token>\n \n <xml name="macro_exclude">\n- <param name="exclude" type="text" label="Exclude" optional="True" help="(-e) exclude sites for which the expression is true">\n+ <param argument="--exclude" type="text" optional="true" label="Exclude" help="Exclude sites for which the expression is true">\n <validator type="regex" message="Single quote not allowed">^[^\']*$</validator>\n <sanitizer sanitize="False"/>\n </param>\n@@ -431,8 +437,8 @@\n </token>\n \n <xml name="macro_columns">\n- <param name="columns" type="text" value="" label="Columns" optional="true"\n- help="list of columns in the annotation file, e.g. CHROM,POS,REF,ALT,-,INFO/TAG. See man page for details">\n+ <param name="columns" type="text" value="" optional="true" label="Columns"\n+ help="List of columns in the annotation file, e.g. CHROM,POS,REF,ALT,-,INFO/TAG. See man page for details">\n <validator type="regex" message="COLUMN names separated by commas">^([^,]+(,[^,]+)*)?$</validator>\n </param>\n </xml>\n'

diff -r f430a1ec7ee4 -r 62ca6da715bf test-data/summary.pdf

Binary file test-data/summary.pdf has changed

diff -r f430a1ec7ee4 -r 62ca6da715bf test-data/view.bcf

Binary file test-data/view.bcf has changed

diff -r f430a1ec7ee4 -r 62ca6da715bf test-data/view.bcf.csi

Binary file test-data/view.bcf.csi has changed

diff -r f430a1ec7ee4 -r 62ca6da715bf test-data/view.vcf_bgzip

Binary file test-data/view.vcf_bgzip has changed