Merge branch 'mypy-1.6' of github.com:scalableminds/webknossos-libs i…

…nto mypy-1.6
scalableminds · Oct 24, 2023 · 4ee5483 · 4ee5483
2 parents a9f30ab + a58b9bf
commit 4ee5483
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/cluster_tools/Changelog.md b/cluster_tools/Changelog.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/) `MAJOR.MIN
 For upgrade instructions, please check the respective *Breaking Changes* sections.
 
 ## Unreleased
-[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.2...HEAD)
+[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.3...HEAD)
 
 ### Breaking Changes
 
@@ -18,6 +18,10 @@ For upgrade instructions, please check the respective *Breaking Changes* section
 ### Fixed
 
 
+## [0.14.3](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.3) - 2023-10-19
+[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.2...v0.14.3)
+
+
 ## [0.14.2](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.2) - 2023-10-18
 [Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.1...v0.14.2)
 

diff --git a/webknossos/Changelog.md b/webknossos/Changelog.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/) `MAJOR.MIN
 For upgrade instructions, please check the respective _Breaking Changes_ sections.
 
 ## Unreleased
-[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.2...HEAD)
+[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.3...HEAD)
 
 ### Breaking Changes
 
@@ -21,6 +21,14 @@ For upgrade instructions, please check the respective _Breaking Changes_ section
 ### Fixed
 
 
+## [0.14.3](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.3) - 2023-10-19
+[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.2...v0.14.3)
+
+### Fixed
+- Fixes bug in FSStore creation when using local paths for zarr data format. [#955](https://github.com/scalableminds/webknossos-libs/pull/955)
+
+
+
 ## [0.14.2](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.2) - 2023-10-18
 [Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.1...v0.14.2)
 

diff --git a/webknossos/webknossos/dataset/_array.py b/webknossos/webknossos/dataset/_array.py
@@ -15,7 +15,7 @@
 from zarr.storage import FSStore
 
 from ..geometry import BoundingBox, Vec3Int, Vec3IntLike
-from ..utils import warn_deprecated
+from ..utils import is_fs_path, warn_deprecated
 from .data_format import DataFormat
 
 if TYPE_CHECKING:
@@ -29,7 +29,7 @@ def _is_power_of_two(num: int) -> bool:
 
 def _fsstore_from_path(path: Path, mode: str = "a") -> FSStore:
     storage_options = {}
-    if isinstance(path, UPath):
+    if isinstance(path, UPath) and not is_fs_path(path):
         storage_options = path._kwargs.copy()
         storage_options.pop("_url", None)
         return FSStore(url=str(path), mode=mode, **storage_options)