Skip to content

Commit

Permalink
Merge branch 'minor-addons' of https://github.com/biocpy/summarizedex…
Browse files Browse the repository at this point in the history
…periment into minor-addons
  • Loading branch information
jkanche committed Jan 2, 2025
2 parents 8a66b73 + e13b9ea commit ce7b78d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion src/summarizedexperiment/RangedSummarizedExperiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,6 @@ def combine_columns(self, *other) -> "RangedSummarizedExperiment":
return combine_columns(self, *other)



############################
######>> combine ops <<#####
############################
Expand Down
4 changes: 2 additions & 2 deletions tests/test_RSE_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ def test_SE_assay_getters_and_setters():
new_tse = tse.set_assay("new_counts", assay=np.random.rand(nrows, ncols), in_place=False)
assert new_tse.get_assay_names() != tse.get_assay_names()
with pytest.raises(Exception):
tse.get_assay("new_counts")
tse.get_assay("new_counts")
assert new_tse.get_assay("new_counts") is not None

tse.set_assay("new_counts", assay=np.random.rand(nrows, ncols), in_place=True)
assert new_tse.get_assay_names() == tse.get_assay_names()
assert tse.get_assay("new_counts") is not None
assert tse.get_assay("new_counts") is not None
assert new_tse.get_assay("new_counts") is not None
6 changes: 3 additions & 3 deletions tests/test_SE_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from biocframe import BiocFrame
import numpy as np
from summarizedexperiment.SummarizedExperiment import SummarizedExperiment
import pytest
import pytest

__author__ = "jkanche"
__copyright__ = "jkanche"
Expand Down Expand Up @@ -118,10 +118,10 @@ def test_SE_assay_getters_and_setters():
new_tse = tse.set_assay("new_counts", assay=np.random.rand(nrows, ncols), in_place=False)
assert new_tse.get_assay_names() != tse.get_assay_names()
with pytest.raises(Exception):
tse.get_assay("new_counts")
tse.get_assay("new_counts")
assert new_tse.get_assay("new_counts") is not None

tse.set_assay("new_counts", assay=np.random.rand(nrows, ncols), in_place=True)
assert new_tse.get_assay_names() == tse.get_assay_names()
assert tse.get_assay("new_counts") is not None
assert tse.get_assay("new_counts") is not None
assert new_tse.get_assay("new_counts") is not None

0 comments on commit ce7b78d

Please sign in to comment.