--- a/vsnp_get_snps.xml	Thu Jul 29 13:16:03 2021 +0000
+++ b/vsnp_get_snps.xml	Tue Aug 03 19:24:50 2021 +0000
@@ -1,13 +1,13 @@
-<tool id="vsnp_get_snps" name="vSNP: get SNPs" version="@WRAPPER_VERSION@.0+galaxy0" profile="@PROFILE@">
+<tool id="vsnp_get_snps" name="vSNP: get SNPs" version="@WRAPPER_VERSION@.1+galaxy0" profile="@PROFILE@">
     <description></description>
     <macros>
         <import>macros.xml</import>
     </macros>
     <requirements>
-        <requirement type="package" version="3.0.7">openpyxl</requirement>
-        <requirement type="package" version="1.3.0">pandas</requirement>
-        <requirement type="package" version="0.6.8">pyvcf</requirement>
-        <requirement type="package" version="2.0.1">xlrd</requirement>
+        <expand macro="openpyxl_requirement"/>
+        <expand macro="pandas_requirement"/>
+        <expand macro="pyvcf_requirement"/>
+        <expand macro="xlrd_requirement"/>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
 #import re
@@ -27,8 +27,7 @@
     #if str($dbkey) == '?':
         #set dbkey = $i.metadata.dbkey
     #else if str($dbkey) != $i.metadata.dbkey:
-        >&2 echo "The dbkeys associated with the zero coverage VCF files with SNPs found in closely related isolate groups are not unique" &&
-exit 1
+        >&2 echo "The dbkeys associated with the zero coverage VCF files with SNPs found in closely related isolate groups are not unique" && exit 1
     #end if
     #set vcf_identifier = re.sub('[^\s\w\-]', '_', str($i.element_identifier))
     ln -s '${i}' '$input_vcf_dir/${vcf_identifier}' &&
@@ -49,7 +48,7 @@
     #if str($input_excel_cond.excel_source_cond.excel_source) == 'cached':
         #set excel_file = 'No genome specified for input VCF (database) file(s)'
         #set excel_fields = $__app__.tool_data_tables['vsnp_excel'].get_fields()
-	## The value of excel_fields is a nested list that looks like this.
+        ## The value of excel_fields is a nested list that looks like this.
         ## [['AF2122', 'Mbovis_define_filter.xlsx', '~/tool-data/vsnp/AF2122/excel/Mbovis_define_filter.xlsx', 'Excel file for AF2122'],...]
         #for $i in $excel_fields:
             #if str($i[0]) == $dbkey:
@@ -110,7 +109,6 @@
                     <when value="cached">
                         <param name="input_excel" type="select" label="Excel file">
                             <options from_data_table="vsnp_excel">
-                                <filter type="data_meta" column="0" key="dbkey" ref="input_vcf_collection"/>
                                 <validator type="no_options" message="No built-in Excel grouping and filtering datasets are available"/>
                             </options>
                         </param>
@@ -122,7 +120,7 @@
             </when>
             <when value="no"/>
         </conditional>
-        <param argument="all_isolates" type="boolean" truevalue="--all_isolates" falsevalue="" checked="false" label="Create a group containing all isolates?"/>
+        <param argument="all_isolates" type="boolean" truevalue="--all_isolates" falsevalue="" checked="true" label="Create a group containing all isolates?"/>
     </inputs>
     <outputs>
         <collection name="snps" type="list" label="${tool.name} on ${on_string} (SNPs)">
@@ -154,6 +152,7 @@
                 </collection>
             </param>
             <param name="input_excel_param" value="no"/>
+            <param name="all_isolates" value=""/>
             <output_collection name="snps" type="list" count="1">
                 <element name="all_vcf" file="all_vcf.fasta" ftype="fasta" compare="contains"/>
             </output_collection>
@@ -182,6 +181,7 @@
                 </collection>
             </param>
             <param name="input_excel_param" value="no"/>
+            <param name="all_isolates" value=""/>
             <output_collection name="snps" type="list" count="1">
                 <element name="all_vcf" file="all_vcf2.fasta" ftype="fasta" compare="contains"/>
             </output_collection>
@@ -211,6 +211,7 @@
             </param>
             <param name="input_excel_param" value="yes"/>
             <param name="input_excel" value="89"/>
+            <param name="all_isolates" value=""/>
             <output_collection name="snps" type="list" count="1">
                 <element name="Mbovis-17" file="Mbovis-17_snps.fasta" ftype="fasta" compare="contains"/>
             </output_collection>