Skip to content

Commit 42c036f

Browse files
committed
lint
1 parent e62f782 commit 42c036f

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

v03_pipeline/bin/pipeline_worker.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
project_pedigree_path,
1414
project_remap_path,
1515
)
16-
<<<<<<< HEAD
17-
from v03_pipeline.lib.tasks import (
18-
UpdateVariantAnnotationsTableWithNewSamplesTask,
19-
)
20-
=======
21-
>>>>>>> 92f827224f608388fc4e20be60a08b1f675c7408
2216
from v03_pipeline.lib.tasks.trigger_hail_backend_reload import TriggerHailBackendReload
2317
from v03_pipeline.lib.tasks.write_success_file import WriteSuccessFileTask
2418

@@ -60,18 +54,6 @@ def main():
6054
'run_id': run_id,
6155
**{k: v for k, v in lpr.model_dump().items() if k != 'projects_to_run'},
6256
}
63-
<<<<<<< HEAD
64-
tasks = [
65-
UpdateVariantAnnotationsTableWithNewSamplesTask(
66-
**loading_run_task_params,
67-
),
68-
WriteSuccessFileTask(**loading_run_task_params),
69-
]
70-
if Env.SHOULD_TRIGGER_HAIL_BACKEND_RELOAD:
71-
tasks.append(
72-
TriggerHailBackendReload(**loading_run_task_params),
73-
)
74-
=======
7557
if Env.SHOULD_TRIGGER_HAIL_BACKEND_RELOAD:
7658
tasks = [
7759
TriggerHailBackendReload(**loading_run_task_params),
@@ -80,7 +62,6 @@ def main():
8062
tasks = [
8163
WriteSuccessFileTask(**loading_run_task_params),
8264
]
83-
>>>>>>> 92f827224f608388fc4e20be60a08b1f675c7408
8465
luigi.build(tasks)
8566
except Exception:
8667
logger.exception('Unhandled Exception')

v03_pipeline/lib/tasks/write_success_file.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
BaseLoadingRunWithProjectInfoParams,
88
)
99
from v03_pipeline.lib.tasks.files import GCSorLocalTarget
10+
from v03_pipeline.lib.tasks.update_variant_annotations_table_with_new_samples import (
11+
UpdateVariantAnnotationsTableWithNewSamplesTask,
12+
)
1013

1114

1215
@luigi.util.inherits(BaseLoadingRunWithProjectInfoParams)

0 commit comments

Comments
 (0)