Skip to content

Commit f9061ea

Browse files
authored
upgrade zarrita (#949)
1 parent 12f992d commit f9061ea

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

webknossos/poetry.lock

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webknossos/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ scikit-learn = "^1.0.1"
5151
scipy = "^1.9.0"
5252
typer = {extras = ["all"], version = "^0.9.0"}
5353
typing-extensions = "^4.0"
54-
universal-pathlib = "0.0.23"
54+
universal-pathlib = "0.1.3"
5555
wkw = "1.1.22"
5656
zarr = "^2.14.0"
5757
zipp = "^3.5.0"
@@ -63,7 +63,7 @@ JPype1 = { version = "^1.3.0", optional = true }
6363
pims = { version = "^0.6.0", optional = true }
6464
tifffile = { version = ">=2021.11.2", optional = true }
6565
pylibCZIrw = { version = "3.5.1", source = "scm", optional = true }
66-
zarrita = "0.1.0a18"
66+
zarrita = "0.1.0a21"
6767

6868
[tool.poetry.extras]
6969
pims = ["pims"]

webknossos/webknossos/dataset/_array.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,15 +565,15 @@ def create(cls, path: Path, array_info: ArrayInfo) -> "ZarritaArray":
565565
+ array_info.chunk_shape.to_tuple(),
566566
codecs=[
567567
zarrita.codecs.transpose_codec("F"),
568-
zarrita.codecs.endian_codec(),
568+
zarrita.codecs.bytes_codec(),
569569
zarrita.codecs.blosc_codec(
570570
typesize=array_info.voxel_type.itemsize
571571
),
572572
]
573573
if array_info.compression_mode
574574
else [
575575
zarrita.codecs.transpose_codec("F"),
576-
zarrita.codecs.endian_codec(),
576+
zarrita.codecs.bytes_codec(),
577577
],
578578
)
579579
],

webknossos/webknossos/utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@ def warn_deprecated(deprecated_item: str, alternative_item: str) -> None:
235235

236236

237237
def is_fs_path(path: Path) -> bool:
238-
return not isinstance(path, UPath)
238+
from upath.implementations.local import PosixUPath, WindowsUPath
239+
240+
return not isinstance(path, UPath) or isinstance(path, (PosixUPath, WindowsUPath))
239241

240242

241243
def strip_trailing_slash(path: Path) -> Path:

0 commit comments

Comments
 (0)