From 0c5c7c04f9f04327d217b1b5b6240a9332360da9 Mon Sep 17 00:00:00 2001 From: kedhammar Date: Tue, 21 May 2024 12:19:17 +0200 Subject: [PATCH 1/3] reduce redundant specificity for anglerfish samplesheet pattern --- taca/nanopore/ONT_run_classes.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/taca/nanopore/ONT_run_classes.py b/taca/nanopore/ONT_run_classes.py index 7f03b8f9..33bddd3c 100644 --- a/taca/nanopore/ONT_run_classes.py +++ b/taca/nanopore/ONT_run_classes.py @@ -461,10 +461,8 @@ def fetch_anglerfish_samplesheet(self) -> bool: b) If the file is not yet available, return False. """ - # Following line assumes run was started same year as samplesheet was generated - expected_file_pattern = f"Anglerfish_samplesheet_{self.experiment_name}_*.csv" - - # Finalize query pattern + # Define query pattern + expected_file_pattern = f"*{self.experiment_name}*.csv" pattern_abspath = os.path.join( self.anglerfish_samplesheets_dir, "*", expected_file_pattern ) From 3c4c14bd3843471a815b355eab915aca8e500970 Mon Sep 17 00:00:00 2001 From: kedhammar Date: Tue, 21 May 2024 12:22:02 +0200 Subject: [PATCH 2/3] bump vlog --- VERSIONLOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/VERSIONLOG.md b/VERSIONLOG.md index 91a1f350..92d79b8a 100644 --- a/VERSIONLOG.md +++ b/VERSIONLOG.md @@ -1,5 +1,9 @@ # TACA Version Log +## 20240521.1 + +Reduce redundant specificity for anglerfish samplesheet pattern + ## 20240520.1 Fix erroneous name of pod5 output dir for ONT runs. From 7846acda0e9b6bc43e4c7ec748348fb609cb95b4 Mon Sep 17 00:00:00 2001 From: kedhammar Date: Mon, 27 May 2024 12:53:10 +0200 Subject: [PATCH 3/3] Use run-specific name to find Anglerfish samplesheet --- VERSIONLOG.md | 4 ++++ taca/nanopore/ONT_run_classes.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/VERSIONLOG.md b/VERSIONLOG.md index 92d79b8a..066a8bd3 100644 --- a/VERSIONLOG.md +++ b/VERSIONLOG.md @@ -1,5 +1,9 @@ # TACA Version Log +## 20240527.1 + +Use run-specific name to find Anglerfish samplesheet. + ## 20240521.1 Reduce redundant specificity for anglerfish samplesheet pattern diff --git a/taca/nanopore/ONT_run_classes.py b/taca/nanopore/ONT_run_classes.py index 33bddd3c..1088c7e9 100644 --- a/taca/nanopore/ONT_run_classes.py +++ b/taca/nanopore/ONT_run_classes.py @@ -462,7 +462,7 @@ def fetch_anglerfish_samplesheet(self) -> bool: """ # Define query pattern - expected_file_pattern = f"*{self.experiment_name}*.csv" + expected_file_pattern = f"*{self.run_name}*.csv" pattern_abspath = os.path.join( self.anglerfish_samplesheets_dir, "*", expected_file_pattern ) @@ -486,7 +486,7 @@ def fetch_anglerfish_samplesheet(self) -> bool: return True else: raise RsyncError( - f"{self.run_name}: Error occured when copying anglerfish samplesheet to run dir." + f"{self.run_name}: Error occurred when copying anglerfish samplesheet to run dir." ) def has_fastq_output(self) -> bool: