|
3 | 3 | import luigi.util |
4 | 4 |
|
5 | 5 | from v03_pipeline.lib.misc.validation import ( |
| 6 | + ALL_VALIDATIONS, |
6 | 7 | SKIPPABLE_VALIDATIONS, |
7 | 8 | SeqrValidationError, |
8 | 9 | ) |
@@ -31,7 +32,8 @@ class ValidateCallsetTask(BaseUpdateTask): |
31 | 32 | def validation_dependencies(self) -> dict[str, hl.Table]: |
32 | 33 | deps = {} |
33 | 34 | if ( |
34 | | - 'validate_sample_type' not in self.validations_to_skip |
| 35 | + ALL_VALIDATIONS not in self.validations_to_skip |
| 36 | + and 'validate_sample_type' not in self.validations_to_skip |
35 | 37 | and self.dataset_type.can_run_validation |
36 | 38 | ): |
37 | 39 | deps['coding_and_noncoding_variants_ht'] = hl.read_table( |
@@ -62,7 +64,8 @@ def output(self) -> luigi.Target: |
62 | 64 | def requires(self) -> list[luigi.Task]: |
63 | 65 | requirements = [self.clone(WriteImportedCallsetTask)] |
64 | 66 | if ( |
65 | | - 'validate_sample_type' not in self.validations_to_skip |
| 67 | + ALL_VALIDATIONS not in self.validations_to_skip |
| 68 | + and 'validate_sample_type' not in self.validations_to_skip |
66 | 69 | and self.dataset_type.can_run_validation |
67 | 70 | ): |
68 | 71 | requirements = [ |
@@ -101,7 +104,10 @@ def update_table(self, mt: hl.MatrixTable) -> hl.MatrixTable: |
101 | 104 | ), |
102 | 105 | ) |
103 | 106 |
|
104 | | - if not self.dataset_type.can_run_validation: |
| 107 | + if ( |
| 108 | + ALL_VALIDATIONS in self.validations_to_skip |
| 109 | + or not self.dataset_type.can_run_validation |
| 110 | + ): |
105 | 111 | return mt.select_globals( |
106 | 112 | callset_path=self.callset_path, |
107 | 113 | validated_sample_type=self.sample_type.value, |
|
0 commit comments