Skip to content

Remove detected.init_store() in Location.__init__ #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove detected.init_store() in Location.__init__ #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions ome_zarr/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import zarr
from zarr.storage import FsspecStore, LocalStore, StoreLike

from .format import CurrentFormat, Format, detect_format
from .format import CurrentFormat, Format
from .types import JSONDict

LOGGER = logging.getLogger("ome_zarr.io")
Expand Down Expand Up @@ -55,15 +55,6 @@ def __init__(
else loader.init_store(self.__path, mode)
)
self.__init_metadata()
detected = detect_format(self.__metadata, loader)
LOGGER.debug("ZarrLocation.__init__ %s detected: %s", path, detected)
if detected != fmt:
LOGGER.warning(
"version mismatch: detected: %s, requested: %s", detected, fmt
)
self.__fmt = detected
self.__store = detected.init_store(self.__path, mode)
self.__init_metadata()

def __init_metadata(self) -> None:
"""
Expand Down
7 changes: 3 additions & 4 deletions ome_zarr/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import zarr
from dask.diagnostics import ProgressBar

from .format import format_from_version
from .format import CurrentFormat, detect_format
from .io import parse_url
from .reader import Multiscales, Node, Reader
from .types import Any, JSONDict
Expand Down Expand Up @@ -339,9 +339,8 @@ def download(input_path: str, output_dir: str = ".") -> None:
target_path = output_path / Path(*path)
target_path.mkdir(parents=True)

# Use version etc...
version = node.zarr.version
fmt = format_from_version(version)
# Use source version...
fmt = detect_format(location.zgroup, CurrentFormat())

# store = parse_url(input_path, mode="w", fmt=fmt)
group_file = "zarr.json"
Expand Down
Loading