diff --git a/python/ndstorage/_superclass.py b/python/ndstorage/_superclass.py index 0c8da54..49baa21 100644 --- a/python/ndstorage/_superclass.py +++ b/python/ndstorage/_superclass.py @@ -1,10 +1,10 @@ import os -from ndstorage.ndtiff_dataset import NDTiffDataset -from ndstorage.ndtiff_pyramid_dataset import NDTiffPyramidDataset -from ndstorage.old_format_version_readers.nd_tiff_v2 import NDTiff_v2_0 -from ndstorage.old_format_version_readers.ndtiff_v1 import NDTiff_v1 +from .ndtiff_dataset import NDTiffDataset +from .ndtiff_pyramid_dataset import NDTiffPyramidDataset +from .old_format_version_readers.nd_tiff_v2 import NDTiff_v2_0 +from .old_format_version_readers.ndtiff_v1 import NDTiff_v1 import numpy as np -from ndstorage.file_io import NDTiffFileIO, BUILTIN_FILE_IO +from .file_io import NDTiffFileIO, BUILTIN_FILE_IO class Dataset: """ diff --git a/python/ndstorage/ndram_dataset.py b/python/ndstorage/ndram_dataset.py index 561ade7..9a41f89 100644 --- a/python/ndstorage/ndram_dataset.py +++ b/python/ndstorage/ndram_dataset.py @@ -1,7 +1,7 @@ from typing import List, Dict, Union import threading -from ndstorage.ndstorage_base import WritableNDStorageAPI, NDStorageBase +from .ndstorage_base import WritableNDStorageAPI, NDStorageBase class NDRAMDataset(NDStorageBase, WritableNDStorageAPI): diff --git a/python/ndstorage/ndstorage_base.py b/python/ndstorage/ndstorage_base.py index 50a5e88..4e67d03 100644 --- a/python/ndstorage/ndstorage_base.py +++ b/python/ndstorage/ndstorage_base.py @@ -19,7 +19,7 @@ import dask.array as da import threading -from ndstorage.ndtiff_file import _POSITION_AXIS, _ROW_AXIS, _COLUMN_AXIS, _Z_AXIS, _TIME_AXIS, _CHANNEL_AXIS +from .ndtiff_file import _POSITION_AXIS, _ROW_AXIS, _COLUMN_AXIS, _Z_AXIS, _TIME_AXIS, _CHANNEL_AXIS # Standard order of axes when opening data. Data does not need to be acquired in this order -- this is just a convention _AXIS_ORDER = {_ROW_AXIS: 7, diff --git a/python/ndstorage/ndtiff_dataset.py b/python/ndstorage/ndtiff_dataset.py index c25f45f..fe5a9dc 100644 --- a/python/ndstorage/ndtiff_dataset.py +++ b/python/ndstorage/ndtiff_dataset.py @@ -6,14 +6,14 @@ import warnings import re -from ndstorage.file_io import NDTiffFileIO, BUILTIN_FILE_IO -from ndstorage.ndtiff_file import SingleNDTiffReader -from ndstorage.ndtiff_file import _CHANNEL_AXIS -from ndstorage.ndtiff_index import NDTiffIndexEntry, read_ndtiff_index +from .file_io import NDTiffFileIO, BUILTIN_FILE_IO +from .ndtiff_file import SingleNDTiffReader +from .ndtiff_file import _CHANNEL_AXIS +from .ndtiff_index import NDTiffIndexEntry, read_ndtiff_index -from ndstorage.ndtiff_file import SingleNDTiffWriter, MAJOR_VERSION, MINOR_VERSION +from .ndtiff_file import SingleNDTiffWriter, MAJOR_VERSION, MINOR_VERSION -from ndstorage.ndstorage_base import WritableNDStorageAPI, NDStorageBase +from .ndstorage_base import WritableNDStorageAPI, NDStorageBase class NDTiffDataset(NDStorageBase, WritableNDStorageAPI): """ diff --git a/python/ndstorage/ndtiff_file.py b/python/ndstorage/ndtiff_file.py index 5b30247..5fcac31 100644 --- a/python/ndstorage/ndtiff_file.py +++ b/python/ndstorage/ndtiff_file.py @@ -7,8 +7,8 @@ import warnings from collections import OrderedDict from io import BytesIO -from ndstorage.file_io import NDTiffFileIO, BUILTIN_FILE_IO -from ndstorage.ndtiff_index import NDTiffIndexEntry +from .file_io import NDTiffFileIO, BUILTIN_FILE_IO +from .ndtiff_index import NDTiffIndexEntry from collections import deque from concurrent.futures import ThreadPoolExecutor diff --git a/python/ndstorage/ndtiff_pyramid_dataset.py b/python/ndstorage/ndtiff_pyramid_dataset.py index dcdbbf1..1ba0a09 100644 --- a/python/ndstorage/ndtiff_pyramid_dataset.py +++ b/python/ndstorage/ndtiff_pyramid_dataset.py @@ -1,8 +1,8 @@ import os import numpy as np import threading -from ndstorage.file_io import NDTiffFileIO, BUILTIN_FILE_IO -from ndstorage.ndtiff_dataset import NDTiffDataset +from .file_io import NDTiffFileIO, BUILTIN_FILE_IO +from .ndtiff_dataset import NDTiffDataset class NDTiffPyramidDataset: """Class that opens a single NDTiffStorage multi-resolution pyramid dataset""" diff --git a/python/ndstorage/old_format_version_readers/nd_tiff_v2.py b/python/ndstorage/old_format_version_readers/nd_tiff_v2.py index 15d9531..fad63a1 100644 --- a/python/ndstorage/old_format_version_readers/nd_tiff_v2.py +++ b/python/ndstorage/old_format_version_readers/nd_tiff_v2.py @@ -9,7 +9,7 @@ import warnings import struct import threading -from ndstorage.file_io import NDTiffFileIO, BUILTIN_FILE_IO +from .file_io import NDTiffFileIO, BUILTIN_FILE_IO _POSITION_AXIS = "position" _ROW_AXIS = "row" diff --git a/python/ndstorage/old_format_version_readers/ndtiff_v1.py b/python/ndstorage/old_format_version_readers/ndtiff_v1.py index 3268fe3..48f4a1c 100644 --- a/python/ndstorage/old_format_version_readers/ndtiff_v1.py +++ b/python/ndstorage/old_format_version_readers/ndtiff_v1.py @@ -8,7 +8,7 @@ import dask.array as da import warnings import struct -from ndstorage.file_io import NDTiffFileIO, BUILTIN_FILE_IO +from .file_io import NDTiffFileIO, BUILTIN_FILE_IO class _MultipageTiffReader: # Class corresponsing to a single multipage tiff file in a Micro-Magellan dataset. Pass the full path of the TIFF to diff --git a/python/ndstorage/test/write_speed_test.py b/python/ndstorage/test/write_speed_test.py index 50c130e..11f28e7 100644 --- a/python/ndstorage/test/write_speed_test.py +++ b/python/ndstorage/test/write_speed_test.py @@ -1,8 +1,8 @@ # import numpy as np # import os # import shutil -# from ndstorage.ndtiff_file import SingleNDTiffWriter, SingleNDTiffReader -# from ndstorage.ndtiff_dataset import NDTiffDataset +# from .ndtiff_file import SingleNDTiffWriter, SingleNDTiffReader +# from .ndtiff_dataset import NDTiffDataset # import pytest # import time # from tqdm import tqdm diff --git a/python/ndstorage/test/writing_test.py b/python/ndstorage/test/writing_test.py index 81b898c..5b1ed8b 100644 --- a/python/ndstorage/test/writing_test.py +++ b/python/ndstorage/test/writing_test.py @@ -1,9 +1,9 @@ import numpy as np import os import shutil -from ndstorage.ndtiff_file import SingleNDTiffWriter, SingleNDTiffReader -from ndstorage.ndtiff_dataset import NDTiffDataset -from ndstorage.ndram_dataset import NDRAMDataset +from .ndtiff_file import SingleNDTiffWriter, SingleNDTiffReader +from .ndtiff_dataset import NDTiffDataset +from .ndram_dataset import NDRAMDataset import pytest @pytest.fixture(scope="function")