diff --git a/VERSIONLOG.md b/VERSIONLOG.md index 0b679461..6bd8461c 100644 --- a/VERSIONLOG.md +++ b/VERSIONLOG.md @@ -1,5 +1,9 @@ # TACA Version Log +## 20260917.2 + +Use the common regex for Illumina run folders in Runs + ## 20260917.1 Bugfix: Flush file and die to avoid runfolder transfer crash of small runs diff --git a/taca/__init__.py b/taca/__init__.py index 7567676c..d48c5701 100644 --- a/taca/__init__.py +++ b/taca/__init__.py @@ -1,3 +1,3 @@ """Main TACA module""" -__version__ = "1.6.25" +__version__ = "1.6.26" diff --git a/taca/illumina/Runs.py b/taca/illumina/Runs.py index 0488e068..39213bac 100644 --- a/taca/illumina/Runs.py +++ b/taca/illumina/Runs.py @@ -11,6 +11,7 @@ from flowcell_parser.classes import LaneBarcodeParser, RunParser, SampleSheetParser from taca.utils import misc +from taca.utils.filesystem import RUN_RE_ILLUMINA from taca.utils.misc import send_mail logger = logging.getLogger(__name__) @@ -47,8 +48,7 @@ def __init__(self, run_dir, software, configuration): self.run_dir = os.path.abspath(run_dir) self.software = software self.id = os.path.basename(os.path.normpath(run_dir)) - pattern = r"(\d{6,8})_([ST-]*\w+\d+)_\d+_([AB]?)([A-Z0-9\-]+)" - m = re.match(pattern, self.id) + m = re.match(RUN_RE_ILLUMINA, self.id) self.date = m.group(1) self.instrument = m.group(2) self.position = m.group(3) diff --git a/taca/utils/filesystem.py b/taca/utils/filesystem.py index 61f72861..f8cf2703 100644 --- a/taca/utils/filesystem.py +++ b/taca/utils/filesystem.py @@ -4,7 +4,7 @@ import os import shutil -RUN_RE_ILLUMINA = r"^\d{6,8}_[a-zA-Z\d\-]+_\d{2,}_[AB0][A-Z\d\-]+$" +RUN_RE_ILLUMINA = r"^(\d{6,8})_([a-zA-Z\d\-]+)_\d+_([AB]?)([A-Z\d\-]+)$" RUN_RE_ONT = r"^(\d{8})_(\d{4})_([0-9a-zA-Z]+)_([0-9a-zA-Z]+)_([0-9a-zA-Z]+)$" RUN_RE_ELEMENT = r"^\d{8}_AV\d{6}_[AB]\d{10}$" RUN_RE_TETON = r"^\d{8}_AV\d{6}_[AB]P\d+P[12]$" # 20260302_AV242103_AP12345P1