Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/spatialexperiment/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
del version, PackageNotFoundError

from .io import read_tenx_visium
from .SpatialExperiment import SpatialExperiment
from .SpatialImage import (
from .spatialexperiment import SpatialExperiment
from .spatialimage import (
LoadedSpatialImage,
RemoteSpatialImage,
StoredSpatialImage,
Expand Down
3 changes: 1 addition & 2 deletions src/spatialexperiment/_combineutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

from biocframe import BiocFrame
import biocutils as ut
from spatialexperiment import SpatialExperiment


def _append_indices_to_samples(bframes: List[BiocFrame]) -> List[BiocFrame]:
Expand All @@ -30,7 +29,7 @@ def _append_indices_to_samples(bframes: List[BiocFrame]) -> List[BiocFrame]:
return modified_bframes


def merge_spatial_frames(x: List[SpatialExperiment], relaxed: bool = False) -> Tuple[BiocFrame, BiocFrame]:
def merge_spatial_frames(x: List["SpatialExperiment"], relaxed: bool = False) -> Tuple[BiocFrame, BiocFrame]:
"""Merge column data and image data from multiple ``SpatialExperiment`` objects.

If duplicate sample IDs exist across objects, appends indices to make them unique.
Expand Down
2 changes: 1 addition & 1 deletion src/spatialexperiment/_imgutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import numpy as np
from PIL import Image
from biocframe import BiocFrame
from .SpatialImage import construct_spatial_image_class
from .spatialimage import construct_spatial_image_class

__author__ = "keviny2"
__copyright__ = "keviny2"
Expand Down
2 changes: 1 addition & 1 deletion src/spatialexperiment/_initutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from biocframe import BiocFrame
from PIL import Image
from .SpatialImage import construct_spatial_image_class
from .spatialimage import construct_spatial_image_class
from summarizedexperiment._frameutils import _sanitize_frame

__author__ = "keviny2"
Expand Down
2 changes: 1 addition & 1 deletion src/spatialexperiment/io/tenx_visium.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from biocframe import BiocFrame
import biocutils as ut
from singlecellexperiment import read_tenx_mtx
from ..SpatialExperiment import SpatialExperiment
from ..spatialexperiment import SpatialExperiment
from .._imgutils import construct_img_data
from .._initutils import construct_spatial_coords_from_names

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
_validate_spatial_coords,
_validate_spatial_coords_names,
)
from .SpatialImage import VirtualSpatialImage, construct_spatial_image_class
from .spatialimage import VirtualSpatialImage, construct_spatial_image_class

__author__ = "keviny2"
__copyright__ = "keviny2"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_get_img.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from copy import deepcopy
import numpy as np

from spatialexperiment.SpatialImage import VirtualSpatialImage
from spatialexperiment import VirtualSpatialImage

__author__ = "keviny2"
__copyright__ = "keviny2"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_img_raster.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
from copy import deepcopy
from PIL import Image
import numpy as np
from spatialexperiment import construct_spatial_image_class
from spatialexperiment.SpatialImage import (
from spatialexperiment import (
LoadedSpatialImage,
StoredSpatialImage,
RemoteSpatialImage
RemoteSpatialImage,
construct_spatial_image_class
)

def test_loaded_spatial_image_img_raster():
Expand Down
6 changes: 3 additions & 3 deletions tests/test_img_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
from pathlib import Path
from PIL import Image
import numpy as np
from spatialexperiment import construct_spatial_image_class
from spatialexperiment.SpatialImage import (
from spatialexperiment import (
LoadedSpatialImage,
StoredSpatialImage,
RemoteSpatialImage
RemoteSpatialImage,
construct_spatial_image_class
)

def test_loaded_spatial_image_img_source():
Expand Down
4 changes: 2 additions & 2 deletions tests/test_spi.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import pytest
from PIL import Image
from spatialexperiment import construct_spatial_image_class
from spatialexperiment.SpatialImage import (
from spatialexperiment import (
VirtualSpatialImage,
StoredSpatialImage,
LoadedSpatialImage,
RemoteSpatialImage,
construct_spatial_image_class
)

__author__ = "keviny2"
Expand Down