Merge pull request #6690 from bedroesb/patch-2

Start updating ENA upload to ena-upload-cli 0.7.5
galaxyproject · Jan 27, 2025 · 6428c6a · 6428c6a
2 parents 37e664b + 560149e
commit 6428c6a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/tools/ena_upload/ena_upload.xml b/tools/ena_upload/ena_upload.xml
@@ -1,7 +1,7 @@
 <tool id="ena_upload" name="ENA Upload tool" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="20.05" license="MIT">
     <description>Submission of (meta)data to the European Nucleotide Archive (ENA)</description>
     <macros>
-        <token name="@TOOL_VERSION@">0.7.3</token>
+        <token name="@TOOL_VERSION@">0.7.5</token>
         <token name="@VERSION_SUFFIX@">1</token>
         <import>samples_macros.xml</import>
     </macros>
@@ -358,7 +358,7 @@ $samples.append({'title':str($sample.sample_title),'description':str($sample.sam
                 <assert_contents>
                     <has_n_lines n="5"/>
                     <has_n_columns n="8"/>
-                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_format\taccession\tsubmission_date\tstatus\tfile_checksum"/>
+                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_format\tfile_checksum\taccession\tsubmission_date\tstatus"/>
                     <has_line_matching expression="r_20201007_026\te_20201007_026\tC026_exp5_clean.fastq.gz\tFASTQ(.*)"/>
                 </assert_contents>
             </output>
@@ -409,7 +409,7 @@ $samples.append({'title':str($sample.sample_title),'description':str($sample.sam
                 <assert_contents>
                     <has_n_lines n="5"/>
                     <has_n_columns n="8"/>
-                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_format\taccession\tsubmission_date\tstatus\tfile_checksum"/>
+                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_format\tfile_checksum\taccession\tsubmission_date\tstatus"/>
                     <has_line_matching expression="r_20201007_026\te_20201007_026\tC026_exp5_clean.fastq.gz\tFASTQ(.*)"/>
                 </assert_contents>
             </output>
@@ -468,7 +468,7 @@ $samples.append({'title':str($sample.sample_title),'description':str($sample.sam
                 <assert_contents>
                     <has_n_lines n="2"/>
                     <has_n_columns n="8"/>
-                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_format\taccession\tsubmission_date\tstatus\tfile_checksum"/>
+                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_format\tfile_checksum\taccession\tsubmission_date\tstatus"/>
                     <has_line_matching expression="r_20201007_026\te_20201007_026\tsample_no_extension.fastq.gz\tFASTQ(.*)"/>
                 </assert_contents>
             </output>
@@ -612,7 +612,7 @@ $samples.append({'title':str($sample.sample_title),'description':str($sample.sam
                 <assert_contents>
                     <has_n_lines n="3"/>
                     <has_n_columns n="8"/>
-                    <has_line_matching expression="alias\tstatus\texperiment_alias\tfile_name\tfile_format\taccession\tsubmission_date\tfile_checksum"/>
+                    <has_line_matching expression="alias\tstatus\texperiment_alias\tfile_name\tfile_format\tfile_checksum\taccession\tsubmission_date"/>
                 </assert_contents>
             </output>
         </test>
@@ -843,7 +843,7 @@ $samples.append({'title':str($sample.sample_title),'description':str($sample.sam
                 <assert_contents>
                     <has_n_lines n="4"/>
                     <has_n_columns n="10"/>
-                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_type\tfile checksum\taccession\tsubmission date\tstatus\tsubmission_date\tfile_checksum"/>
+                    <has_line_matching expression="alias\texperiment_alias\tfile_name\tfile_type\tfile checksum\taccession\tsubmission date\tstatus\tfile_checksum\tsubmission_date"/>
                 </assert_contents>
             </output>
         </test>