# HG changeset patch
# User peterjc
# Date 1606661430 0
# Node ID 850361021818f8f00a99ad416f86feb1abfd5caf
# Parent  061c2abccfea3fb120e89ae8a6e843353b8c1cf4
"planemo upload for repository https://github.com/peterjc/galaxy_blast/tree/master/tools/ncbi_blast_plus commit cae95c73da24c209edbe9e8293e0b9f6ffd05a8e-dirty"

diff -r 061c2abccfea -r 850361021818 tools/ncbi_blast_plus/README.rst
--- a/tools/ncbi_blast_plus/README.rst	Thu Sep 10 13:21:55 2020 +0000
+++ b/tools/ncbi_blast_plus/README.rst	Sun Nov 29 14:50:30 2020 +0000
@@ -136,6 +136,7 @@
 ============== ===============================================================
 Version        Changes
 -------------- ---------------------------------------------------------------
+2.10.1+galaxy1 - Make locally installed database selector non-optional.
 2.10.1+galaxy0 - Updated for NCBI BLAST+ 2.10.1 release.
                - Supports locally installed v4 or v5 format BLAST databases
                  (listed in the ``blastdb*.loc`` files).
@@ -248,6 +249,15 @@
         - Supports setting a taxonomy ID in ``makeblastdb`` wrapper.
         - Subtle changes like new conditional settings will require some old
           workflows be updated to cope.
+v0.0.22 - More use of macros to simplify the wrappers.
+        - Set number of threads via ``$GALAXY_SLOTS`` environment variable.
+        - More descriptive default output names.
+        - Tests require updated BLAST DB definitions (``blast_datatypes``
+          v0.0.18).
+        - Pre-check for duplicate identifiers in ``makeblastdb`` wrapper.
+        - Tests updated for BLAST+ 2.2.28 instead of BLAST+ 2.2.27.
+        - Now depends on ``package_blast_plus_2_2_28`` in ToolShed.
+        - Extended tabular output includes 'salltitles' as column 25.
 v0.0.21 - Use macros to simplify the XML wrappers (by John Chilton).
         - Added wrapper for dustmasker.
         - Enabled masking for makeblastdb (Nicola Soranzo).
@@ -288,15 +298,6 @@
           e-values
 v0.0.11 - Final revision as part of the Galaxy main repository, and the
           first release via the Tool Shed
-v0.0.22 - More use of macros to simplify the wrappers.
-        - Set number of threads via ``$GALAXY_SLOTS`` environment variable.
-        - More descriptive default output names.
-        - Tests require updated BLAST DB definitions (``blast_datatypes``
-          v0.0.18).
-        - Pre-check for duplicate identifiers in ``makeblastdb`` wrapper.
-        - Tests updated for BLAST+ 2.2.28 instead of BLAST+ 2.2.27.
-        - Now depends on ``package_blast_plus_2_2_28`` in ToolShed.
-        - Extended tabular output includes 'salltitles' as column 25.
 ======= ======================================================================
 
 
diff -r 061c2abccfea -r 850361021818 tools/ncbi_blast_plus/ncbi_macros.xml
--- a/tools/ncbi_blast_plus/ncbi_macros.xml	Thu Sep 10 13:21:55 2020 +0000
+++ b/tools/ncbi_blast_plus/ncbi_macros.xml	Sun Nov 29 14:50:30 2020 +0000
@@ -1,6 +1,6 @@
 <macros>
     <token name="@TOOL_VERSION@">2.10.1</token>
-    <token name="@VERSION_SUFFIX@">0</token>
+    <token name="@VERSION_SUFFIX@">1</token>
     <token name="@PROFILE@">16.10</token>
     <xml name="parallelism">
         <!-- If job splitting is enabled, break up the query file into parts -->
@@ -353,7 +353,7 @@
               <option value="file">FASTA file from your history (see warning note below)</option>
             </param>
             <when value="db">
-                <param name="database" type="select" multiple="true" label="Nucleotide BLAST database">
+                <param name="database" type="select" multiple="true" optional="false" label="Nucleotide BLAST database">
                     <options from_data_table="blastdb" />
                 </param>
                 <param name="histdb" type="hidden" value="" />
@@ -381,7 +381,7 @@
               <option value="file">FASTA file from your history (see warning note below)</option>
             </param>
             <when value="db">
-                <param name="database" type="select" multiple="true" label="Protein BLAST database">
+                <param name="database" type="select" multiple="true" optional="false" label="Protein BLAST database">
                     <options from_data_table="blastdb_p" />
                 </param>
                 <param name="histdb" type="hidden" value="" />
@@ -452,7 +452,7 @@
                           <option value="histdb">BLAST database from your history</option>
                       </param>
                       <when value="db">
-                          <param name="database" argument="-db" type="select" multiple="true" label="Protein BLAST database">
+                          <param name="database" argument="-db" type="select" multiple="true" optional="false" label="Protein BLAST database">
                             <options from_data_table="blastdb_p" />
                         </param>
                         <param name="histdb" type="hidden" value="" />