Skip to content

Commit b27e7d6

Browse files
committed
self.files_regex = long_read
1 parent e596ade commit b27e7d6

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/qp_klp/Assays.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ def qc_reads(self):
494494
# is not defined, just fallback to the SPP expected default regex
495495
if not hasattr(self, 'files_regex'):
496496
self.files_regex = 'SPP'
497+
497498
# base quality control used by multiple Assay types.
498499
job = NuQCJob(self.raw_fastq_files_path,
499500
self.pipeline.output_path,

src/qp_klp/PacBioMetagenomicWorkflow.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ def __init__(self, **kwargs):
2626
if 'overwrite_prep_with_original' in self.kwargs:
2727
self.overwrite_prep_with_original = \
2828
self.kwargs['overwrite_prep_with_original']
29-
if 'files_regex' in self.kwargs:
30-
self.files_regex = self.kwargs['files_regex']
31-
else:
32-
self.files_regex = 'SPP'
29+
self.files_regex = 'long_read'
3330
self.pipeline = Pipeline(self.kwargs['config_fp'],
3431
self.kwargs['run_identifier'],
3532
self.kwargs['uif_path'],

src/sequence_processing_pipeline/util.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
PAIR_UNDERSCORE = (REC(r'_R1_'), '_R1_', '_R2_')
66
PAIR_DOT = (REC(r'\.R1\.'), '.R1.', '.R2.')
7-
SIMPLE_PAIR_UNDERSCAOTE = (REC(r'_R1'), '_R1', '_R2')
8-
PAIR_TESTS = (PAIR_UNDERSCORE, PAIR_DOT, SIMPLE_PAIR_UNDERSCAOTE)
7+
SIMPLE_PAIR_UNDERSCORE = (REC(r'_R1'), '_R1', '_R2')
8+
PAIR_TESTS = (PAIR_UNDERSCORE, PAIR_DOT, SIMPLE_PAIR_UNDERSCORE)
99
FILES_REGEX = {
1010
'SPP': {
1111
'fastq': REC(r'^(.*)_S\d{1,4}_L\d{3}_R\d_\d{3}\.fastq\.gz$'),
@@ -32,6 +32,12 @@
3232
'html': REC(r'^(.*).html$'),
3333
'json': REC(r'^(.*).json$')
3434
},
35+
'long_read': {
36+
'fastq': REC(r'^(.*)_R1.fastq\.gz$'),
37+
'interleave_fastq': REC(r'^(.*)_R1.interleave\.fastq\.gz$'),
38+
'html': REC(r'^(.*)_R1.html$'),
39+
'json': REC(r'^(.*)_R1.json$')
40+
},
3541
}
3642

3743

tests/test_PacBioWorflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def _inject_data(self, wf):
5454
fastqc_dir = f'{self.output_dir}/FastQCJob/logs/'
5555
multiqc_dir = f'{self.output_dir}/MultiQCJob/logs/'
5656
genprep_dir = (f'{self.output_dir}/GenPrepFileJob/'
57-
'211021_A00000_0000_SAMPLE/')
57+
'r11111_20250101_111111/')
5858
makedirs(nuqc_dir, exist_ok=True)
5959
makedirs(fastqc_dir, exist_ok=True)
6060
makedirs(multiqc_dir, exist_ok=True)

0 commit comments

Comments
 (0)