Skip to content

Commit e2b9c5b

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 4d3c8db commit e2b9c5b

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ def gt_tm_annotation() -> np.ndarray:
260260
for i in range(10):
261261
tm[i][i] = 1
262262
for i in range(10, 15):
263-
tm[i-5][i] = 1
264-
for j in range(2,5):
265-
for i in range(2,5):
263+
tm[i - 5][i] = 1
264+
for j in range(2, 5):
265+
for i in range(2, 5):
266266
tm[i][j] = 0.3 if i != j else 0.4
267267
return tm

tests/problems/cross_modality/test_mixins.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def test_cell_transition_pipeline(
109109

110110
@pytest.mark.fast()
111111
@pytest.mark.parametrize("forward", [True, False])
112-
@pytest.mark.parametrize("mapping_mode",["max", "sum"])
112+
@pytest.mark.parametrize("mapping_mode", ["max", "sum"])
113113
@pytest.mark.parametrize("problem_kind", ["cross_modality"])
114114
def test_annotation_mapping(
115115
self, adata_anno: Tuple[AnnData, AnnData], forward: bool, mapping_mode, gt_tm_annotation
@@ -122,14 +122,14 @@ def test_annotation_mapping(
122122
tp[problem_keys].set_solution(MockSolverOutput(gt_tm_annotation), overwrite=True)
123123
annotation_label = "celltype1" if forward else "celltype2"
124124
result = tp.annotation_mapping(
125-
mapping_mode=mapping_mode,
126-
annotation_label=annotation_label,
127-
forward=forward,
128-
source="src",
129-
target="tgt"
125+
mapping_mode=mapping_mode, annotation_label=annotation_label, forward=forward, source="src", target="tgt"
130126
)
131127
if forward:
132-
expected_result = adata_src.uns["expected_max1"] if mapping_mode == "max" else adata_src.uns["expected_sum1"]
128+
expected_result = (
129+
adata_src.uns["expected_max1"] if mapping_mode == "max" else adata_src.uns["expected_sum1"]
130+
)
133131
else:
134-
expected_result = adata_tgt.uns["expected_max2"] if mapping_mode == "max" else adata_tgt.uns["expected_sum2"]
132+
expected_result = (
133+
adata_tgt.uns["expected_max2"] if mapping_mode == "max" else adata_tgt.uns["expected_sum2"]
134+
)
135135
assert (result[annotation_label] == expected_result).all()

tests/problems/space/test_mixins.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,16 @@ def test_annotation_mapping(self, adata_anno: AnnData, forward: bool, mapping_mo
112112
forward=forward,
113113
)
114114
if forward:
115-
expected_result = adata_anno.uns["expected_max1"] if mapping_mode == "max" else adata_anno.uns["expected_sum1"]
115+
expected_result = (
116+
adata_anno.uns["expected_max1"] if mapping_mode == "max" else adata_anno.uns["expected_sum1"]
117+
)
116118
else:
117-
expected_result = adata_anno.uns["expected_max2"] if mapping_mode == "max" else adata_anno.uns["expected_sum2"]
119+
expected_result = (
120+
adata_anno.uns["expected_max2"] if mapping_mode == "max" else adata_anno.uns["expected_sum2"]
121+
)
118122
assert (result[annotation_label] == expected_result).all()
119123

124+
120125
class TestSpatialMappingAnalysisMixin:
121126
@pytest.mark.parametrize("sc_attr", [{"attr": "X"}, {"attr": "obsm", "key": "X_pca"}])
122127
@pytest.mark.parametrize("var_names", ["0", [str(i) for i in range(20)]])

tests/problems/time/test_mixins.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_cell_transition_full_pipeline(self, gt_temporal_adata: AnnData, forward
5151
np.testing.assert_allclose(present_cell_type_marginal, 1.0)
5252

5353
@pytest.mark.fast()
54-
@pytest.mark.parametrize("forward",[True, False])
54+
@pytest.mark.parametrize("forward", [True, False])
5555
@pytest.mark.parametrize("mapping_mode", ["max", "sum"])
5656
@pytest.mark.parametrize("problem_kind", ["temporal"])
5757
def test_annotation_mapping(self, adata_anno: AnnData, forward: bool, mapping_mode, gt_tm_annotation):
@@ -63,11 +63,15 @@ def test_annotation_mapping(self, adata_anno: AnnData, forward: bool, mapping_mo
6363
annotation_label = "celltype1" if forward else "celltype2"
6464
result = problem.annotation_mapping(
6565
mapping_mode=mapping_mode, annotation_label=annotation_label, forward=forward, source=0, target=1
66-
)
66+
)
6767
if forward:
68-
expected_result = adata_anno.uns["expected_max1"] if mapping_mode == "max" else adata_anno.uns["expected_sum1"]
68+
expected_result = (
69+
adata_anno.uns["expected_max1"] if mapping_mode == "max" else adata_anno.uns["expected_sum1"]
70+
)
6971
else:
70-
expected_result = adata_anno.uns["expected_max2"] if mapping_mode == "max" else adata_anno.uns["expected_sum2"]
72+
expected_result = (
73+
adata_anno.uns["expected_max2"] if mapping_mode == "max" else adata_anno.uns["expected_sum2"]
74+
)
7175
assert (result[annotation_label] == expected_result).all()
7276

7377
@pytest.mark.fast()

0 commit comments

Comments
 (0)