--- a/kobas_macros.xml	Thu Nov 10 16:21:41 2016 -0500
+++ b/kobas_macros.xml	Thu Nov 28 15:50:07 2019 -0500
@@ -1,23 +1,21 @@
 <macros>
-    <token name="@WRAPPER_VERSION@">0.4</token>
-    <token name="@KOBAS_VERSION@">2.1.1</token>
+    <token name="@TOOL_VERSION@">2.1.1</token>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="@KOBAS_VERSION@">kobas</requirement>
+            <requirement type="package" version="@TOOL_VERSION@">kobas</requirement>
+            <!-- kobas 2.1.1 is not compatible with Biopython >=1.73 due to https://github.com/biopython/biopython/issues/1952 -->
+            <requirement type="package" version="1.72">biopython</requirement>
+            <!-- Help conda resolving the enviroment, hopefully this can be removed for next update -->
+            <requirement type="package" version="3.4">r-base</requirement>
         </requirements>
     </xml>
     <xml name="input_kobasdb">
-        <param
-            name="species"
-            type="text"
-            label="Species abbreviation"
-            argument="--species"
-            help="For example: ko for KEGG
-                        Orthology, hsa for Homo sapiens, mmu for Mus musculus,
-                        dme for Drosophila melanogaster, ath for Arabidopsis
-                        thaliana, sce for Saccharomyces cerevisiae and eco for
-                        Escherichia coli K-12 MG1655"/>
-        <param format="sqlite" name="kobasdb" type="data" label="KOBAS database" help="KOBAS species database, available for multiple species at http://kobas.cbi.pku.edu.cn/download.php"/>
+        <param argument="--species" type="text" label="Species abbreviation"
+            help="For example: ko for KEGG Orthology, hsa for Homo sapiens, mmu
+                for Mus musculus, dme for Drosophila melanogaster, ath for
+                Arabidopsis thaliana, sce for Saccharomyces cerevisiae and eco
+                for Escherichia coli K-12 MG1655"/>
+        <param name="kobasdb" type="data" format="sqlite" label="KOBAS database" help="KOBAS species database, available for multiple species at http://kobas.cbi.pku.edu.cn/download.php"/>
     </xml>
     <xml name="blastdb_selector">
         <param name="choice" type="select" label="BLAST Protein database">
@@ -26,26 +24,16 @@
             <option value="local" selected="True">Locally installed BLAST database</option>
         </param>
         <when value="fasta">
-            <param name="fastadb" format="fasta" type="data" label="FASTA File for BLAST DB" help="FASTA file which will be used to create a BLAST database with makeblastdb."/>
-            <param name="histdb" type="hidden" value=""/>
-            <param name="fasta" type="hidden" value=""/>
+            <param name="fastadb" type="data" format="fasta" label="FASTA File for BLAST DB" help="FASTA file which will be used to create a BLAST database with makeblastdb."/>
         </when>
         <when value="histdb">
-            <param name="localdb" type="hidden" value=""/>
-            <param name="fastadb" type="hidden" value=""/>
-            <param
-                name="histdb"
-                type="data"
-                format="blastdbp"
-                label="Protein BLAST database"
+            <param name="histdb" type="data" format="blastdbp" label="Protein BLAST database"
                 help="The protein BlAST database used by KOBAS. FASTA files to create BLAST databases with makeblastdb can be found for multiple species at http://kobas.cbi.pku.edu.cn/download.php"/>
         </when>
         <when value="local">
             <param name="localdb" type="select" label="Protein BLAST database">
                 <options from_data_table="blastdb_p"/>
             </param>
-            <param name="histdb" type="hidden" value=""/>
-            <param name="fastadb" type="hidden" value=""/>
         </when>
     </xml>
     <xml name="kobas_citations">