# HG changeset patch
# User iuc
# Date 1728133661 0
# Node ID e4e12f0b3af19d56119d54bec9ab6bd6dafc3334
# Parent  4c8a1c7d360801a51a23c06d75b001b651fd4384
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/umi_tools commit bc1b362f6783d3fc0ed0f42c14687001d7ff5f7a

diff -r 4c8a1c7d3608 -r e4e12f0b3af1 macros.xml
--- a/macros.xml	Sat Sep 28 16:40:06 2024 +0000
+++ b/macros.xml	Sat Oct 05 13:07:41 2024 +0000
@@ -4,8 +4,8 @@
     <!-- macros applying to all umi_tools -->
 
     <token name="@TOOL_VERSION@">1.1.5</token>
-    <token name="@VERSION_SUFFIX@">0</token>
-    <token name="@PROFILE@">21.01</token>
+    <token name="@VERSION_SUFFIX@">1</token>
+    <token name="@PROFILE@">23.1</token>
     <xml name="requirements">
         <requirements>
             <requirement type="package" version="@TOOL_VERSION@">umi_tools</requirement>
@@ -104,8 +104,8 @@
                 <expand macro="barcode1_macro"/>
             </when>
             <when value="paired">
-                <param name="input_read1" type="data" format="@FASTQ_FORMATS@" label="Reads in FASTQ format" />
-                <param name="input_read2" type="data" format="@FASTQ_FORMATS@" label="Reads in FASTQ format" />
+                <param name="input_read1" type="data" format="@FASTQ_FORMATS@" label="Forward reads in FASTQ format" />
+                <param name="input_read2" type="data" format="@FASTQ_FORMATS@" label="Reverse reads in FASTQ format" />
                 <expand macro="barcode1_macro"/>
                 <expand macro="barcode2_macro"/>
                 <yield/>
@@ -152,11 +152,11 @@
 
     <token name="@LINK_SAM_BAM_INPUT@"><![CDATA[
         #if $input.is_of_type("sam"):
-            ## TODO dedup has problems with SAM input in some cases
+            ## sam input is not supported for paired data
             ## https://github.com/CGATOxford/UMI-tools/issues/483
-            ## so convert it to sorted BAM for now
+            ## so convert it to sorted BAM
             ## #set $input_file = $input
-            samtools sort --no-PG '$input' > 'input.bam' &&
+            samtools sort --no-PG '$input' -O BAM > 'input.bam' &&
             samtools index -b 'input.bam' &&
             #set $input_file = 'input.bam'
         #else:
@@ -166,7 +166,7 @@
         #end if
     ]]></token>
     <token name="@SET_INPUT_TYPE@"><![CDATA[
-        ## TODO see comment in LINK_SAM_BAM_INPUT
+        ## see comment in LINK_SAM_BAM_INPUT
         ## #if $input.is_of_type("sam"):
         ##     --in-sam
         ## #end if
@@ -511,12 +511,12 @@
             <param argument="--assigned-status-tag" type="text" optional="true" label="Bam tag describing whether read is assigned to a gene" help="By default, this is set as the same tag as --gene-tag">
                 <expand macro="sanitize_tag" />
             </param>
-            <param argument="--skip-tags-regex" name="skip_tags_regex" type="text" label="Skip any reads where the gene matches this tag" value="" >
+            <param argument="--skip-tags-regex" type="text" label="Skip any reads where the gene matches this tag" value="" >
                 <expand macro="barcode_sanitizer" />
             </param>
             <param argument="--per-contig" type="boolean" truevalue="--per-contig" falsevalue="" label="Deduplicate per contig" help="Field 3 in BAM; RNAME. All reads with the same contig will be considered to have the same alignment position. This is useful if your library prep generates PCR duplicates with non identical alignment positions such as CEL-Seq. In this case, you would align to a reference transcriptome with one transcript per gene" />
             <param argument="--gene-transcript-map" type="data" format="tabular" optional="true" label="Tabular file mapping genes to transripts" />
-            <param argument="--per-cell" name="per_cell" type="boolean" truevalue="--per-cell" falsevalue="" label="Group reads only if they have the same cell barcode" />
+            <param argument="--per-cell" type="boolean" truevalue="--per-cell" falsevalue="" label="Group reads only if they have the same cell barcode" />
         </section>
     </xml>
     <token name="@SC_OPTIONS@"><![CDATA[
diff -r 4c8a1c7d3608 -r e4e12f0b3af1 umi-tools_whitelist.xml
--- a/umi-tools_whitelist.xml	Sat Sep 28 16:40:06 2024 +0000
+++ b/umi-tools_whitelist.xml	Sat Oct 05 13:07:41 2024 +0000
@@ -1,9 +1,9 @@
 <tool id="umi_tools_whitelist" name="UMI-tools whitelist" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
     <description>Extract cell barcodes from FASTQ files</description>
-    <expand macro="bio_tools"/>
     <macros>
         <import>macros.xml</import>
     </macros>
+    <expand macro="bio_tools"/>
     <expand macro="requirements" />
     <command detect_errors="exit_code"><![CDATA[
         #import json
@@ -98,13 +98,13 @@
     <outputs>
         <data name="out_whitelist" format="tabular" label="${tool.name} on ${on_string}: Whitelist"/>
         
-        <data name="filtered_out" format_source="input_read1" label="${tool.name} on ${on_string}: reads not matching regex pattern">
+        <data name="filtered_out" format_source="input_read1" label="${tool.name} on ${on_string}: Forward reads not matching regex pattern">
             <filter>extract_method_cond['extract_method'] == 'regex' and extract_method_cond['filtered_out_bool'] and input_type_cond['input_type'] in ['single', 'paired']</filter>
         </data>
-        <data name="filtered_out_paired" format_source="input_read2" label="${tool.name} on ${on_string}: reads not matching regex pattern">
+        <data name="filtered_out_paired" format_source="input_read2" label="${tool.name} on ${on_string}: Reverse reads not matching regex pattern">
             <filter>extract_method_cond['extract_method'] == 'regex' and extract_method_cond['filtered_out_bool'] and input_type_cond['input_type'] == 'paired'</filter>
         </data>
-        <collection name="filtered_out_paired_collection" type="paired" label="${tool.name} on ${on_string}: reads not matching regex pattern">
+        <collection name="filtered_out_paired_collection" type="paired" label="${tool.name} on ${on_string}: Reads not matching regex pattern">
             <data name="forward" format_source="input_readpair" />
             <data name="reverse" format_source="input_readpair" />
             <filter>extract_method_cond['extract_method'] == 'regex' and extract_method_cond['filtered_out_bool'] and input_type_cond['input_type'] == 'paired_collection'</filter>