Skip to content

Commit 54ed7bb

Browse files
authored
Merge pull request #694 from broadinstitute/dev
Dev
2 parents 1c7b59e + b053f2c commit 54ed7bb

File tree

90 files changed

+2124
-1509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2124
-1509
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
run: ruff . --output-format github
3535
- name: Unit Tests
3636
run: |
37+
export REFERENCE_DATA_AUTO_UPDATE=1
3738
export ACCESS_PRIVATE_REFERENCE_DATASETS=1
3839
export PYSPARK_SUBMIT_ARGS='--driver-memory 8G pyspark-shell'
3940
nosetests --with-coverage --cover-package v03_pipeline/lib v03_pipeline/lib

v03_pipeline/bin/write_combined_interval_reference_ht.py

Lines changed: 0 additions & 76 deletions
This file was deleted.

v03_pipeline/bin/write_combined_reference_ht.py

Lines changed: 0 additions & 93 deletions
This file was deleted.

v03_pipeline/bin/write_hgmd_ht.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

v03_pipeline/lib/annotations/mito.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,13 @@ def gt_stats(
7979
ref_samples_length = row.ref_samples[project_guid].length()
8080
heteroplasmic_samples_length = row.heteroplasmic_samples[project_guid].length()
8181
homoplasmic_samples_length = row.homoplasmic_samples[project_guid].length()
82-
AC_het += heteroplasmic_samples_length # noqa: N806
83-
AC_hom += homoplasmic_samples_length # noqa: N806
84-
AN += (ref_samples_length + heteroplasmic_samples_length + homoplasmic_samples_length) # noqa: N806
82+
AC_het += heteroplasmic_samples_length # noqa: N806
83+
AC_hom += homoplasmic_samples_length # noqa: N806
84+
AN += ( # noqa: N806
85+
ref_samples_length
86+
+ heteroplasmic_samples_length
87+
+ homoplasmic_samples_length
88+
)
8589
return hl.Struct(
8690
AC_het=AC_het,
8791
AF_het=hl.float32(AC_het / AN),

v03_pipeline/lib/annotations/snv_indel_test.py

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,21 @@ def test_allele_count_annotations(self) -> None:
2525
[
2626
{
2727
'id': 0,
28-
'ref_samples': hl.Struct(project_1={'a', 'c'}, project_2=set(), R0607_gregor_training_project_=set()),
29-
'het_samples': hl.Struct(project_1={'b', 'd'}, project_2=set(), R0607_gregor_training_project_=set()),
30-
'hom_samples': hl.Struct(project_1={'e', 'f'}, project_2=set(), R0607_gregor_training_project_={'l', 'm'}),
28+
'ref_samples': hl.Struct(
29+
project_1={'a', 'c'},
30+
project_2=set(),
31+
R0607_gregor_training_project_=set(),
32+
),
33+
'het_samples': hl.Struct(
34+
project_1={'b', 'd'},
35+
project_2=set(),
36+
R0607_gregor_training_project_=set(),
37+
),
38+
'hom_samples': hl.Struct(
39+
project_1={'e', 'f'},
40+
project_2=set(),
41+
R0607_gregor_training_project_={'l', 'm'},
42+
),
3143
},
3244
{
3345
'id': 1,
@@ -36,8 +48,16 @@ def test_allele_count_annotations(self) -> None:
3648
project_2=set(),
3749
R0607_gregor_training_project_={'l', 'm'},
3850
),
39-
'het_samples': hl.Struct(project_1=set(), project_2=set(), R0607_gregor_training_project_=set()),
40-
'hom_samples': hl.Struct(project_1=set(), project_2=set(), R0607_gregor_training_project_=set()),
51+
'het_samples': hl.Struct(
52+
project_1=set(),
53+
project_2=set(),
54+
R0607_gregor_training_project_=set(),
55+
),
56+
'hom_samples': hl.Struct(
57+
project_1=set(),
58+
project_2=set(),
59+
R0607_gregor_training_project_=set(),
60+
),
4161
},
4262
],
4363
hl.tstruct(

0 commit comments

Comments
 (0)