Skip to content

Commit 116bb05

Browse files
committed
fix most of teh tests
1 parent 51cac06 commit 116bb05

5 files changed

Lines changed: 37 additions & 9 deletions

File tree

cg_hermes/config/nallo.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
AnalysisTags,
1111
BioinfoToolsTags,
1212
FamilyTags,
13+
InputFileTags,
1314
MipTags,
1415
NalloTags,
1516
NextflowTags,
@@ -400,6 +401,16 @@
400401
"tags": [NextflowTags.SAMPLESHEET],
401402
"used_by": [UsageTags.CG, UsageTags.LONG_TERM_STORAGE],
402403
},
404+
frozenset({"rank-model-snv"}): {
405+
"is_mandatory": True,
406+
"tags": [InputFileTags.RANK_MODEL_SNV],
407+
"used_by": [UsageTags.SCOUT, UsageTags.LONG_TERM_STORAGE],
408+
},
409+
frozenset({"rank-model-sv"}): {
410+
"is_mandatory": True,
411+
"tags": [InputFileTags.RANK_MODEL_SV],
412+
"used_by": [UsageTags.SCOUT, UsageTags.LONG_TERM_STORAGE],
413+
},
403414
}
404415

405416
NALLO_TAGS = {**NALLO_COMMON_TAGS, **NEXTFLOW_TAGS}

cg_hermes/config/raredisease.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
AnalysisTags,
1111
BioinfoToolsTags,
1212
FamilyTags,
13+
InputFileTags,
1314
MipTags,
1415
NextflowTags,
1516
QCTags,
1617
RarediseaseTags,
1718
ReportTags,
18-
VariantTags,
1919
UsageTags,
20+
VariantTags,
2021
)
2122

2223
RAREDISEASE_COMMON_TAGS = {
@@ -344,6 +345,16 @@
344345
"is_mandatory": True,
345346
"used_by": [UsageTags.CLINICAL_DELIVERY, UsageTags.LONG_TERM_STORAGE],
346347
},
348+
frozenset({"rank-model-snv"}): {
349+
"is_mandatory": True,
350+
"tags": [InputFileTags.RANK_MODEL_SNV],
351+
"used_by": [UsageTags.SCOUT, UsageTags.LONG_TERM_STORAGE],
352+
},
353+
frozenset({"rank-model-sv"}): {
354+
"is_mandatory": True,
355+
"tags": [InputFileTags.RANK_MODEL_SV],
356+
"used_by": [UsageTags.SCOUT, UsageTags.LONG_TERM_STORAGE],
357+
},
347358
}
348359

349360
RAREDISEASE_TAGS = {**RAREDISEASE_COMMON_TAGS, **NEXTFLOW_TAGS}

cg_hermes/constants/tags.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,11 @@ def description(self) -> str:
518518
return descriptions.get(self, "Description not available")
519519

520520

521+
class InputFileTags(StrEnum):
522+
RANK_MODEL_SNV = "rank-model-snv"
523+
RANK_MODEL_SV = "rank-model-sv"
524+
525+
521526
class MipTags(StrEnum):
522527
EXE_VER: str = "exe-ver"
523528
MIP_ANALYSE: str = "mip-analyse"
@@ -819,6 +824,7 @@ class UsageTags(StrEnum):
819824
AnalysisTags,
820825
BioinfoToolsTags,
821826
FamilyTags,
827+
InputFileTags,
822828
QCTags,
823829
RawDataTags,
824830
ReportTags,

tests/fixtures/nallo/case_id_deliverables.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,10 @@ files:
633633
- format: ini
634634
id: CASEID
635635
path: PATHTOCASE/CASEID_rank_model_snvs.ini
636-
step: rank-models-snv
637-
tag: rank-models-snv
636+
step: rank-model-snv
637+
tag: rank-model-snv
638638
- format: ini
639639
id: CASEID
640640
path: PATHTOCASE/CASEID_rank_model_svs.ini
641-
step: rank-models-sv
642-
tag: rank-models-sv
641+
step: rank-model-sv
642+
tag: rank-model-sv

tests/fixtures/raredisease/case_id_deliverables.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,10 +833,10 @@ files:
833833
- format: ini
834834
id: CASEID
835835
path: PATHTOCASE/CASEID_rank_model_snvs.ini
836-
step: rank-models-snv
837-
tag: rank-models-snv
836+
step: rank-model-snv
837+
tag: rank-model-snv
838838
- format: ini
839839
id: CASEID
840840
path: PATHTOCASE/CASEID_rank_model_svs.ini
841-
step: rank-models-sv
842-
tag: rank-models-sv
841+
step: rank-model-sv
842+
tag: rank-model-sv

0 commit comments

Comments
 (0)