Merge branch 'main' into 661

Author: BrianMichell

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
   "image": "mcr.microsoft.com/devcontainers/python:1-3.13-bookworm",
   // Configure tool-specific properties.
   "features": {
-    "ghcr.io/va-h/devcontainers-features/uv:1": { "version": "0.8.15" }
+    "ghcr.io/va-h/devcontainers-features/uv:1": { "version": "0.8.17" }
   },
   "customizations": {
     "vscode": {

.devcontainer/post-create.sh

@@ -2,6 +2,10 @@
 
 set -e
 
+# Install useful developer tools used by mdio development
+uv tool install nox
+uv tool install bump-my-version
+
 # Sync the environment, installing the project editable and including dev dependencies
 uv sync
 

docs/requirements.txt

@@ -1,8 +1,10 @@
+aiohttp==3.12.15
 autodoc-pydantic==2.2.0
 furo==2025.7.19
 linkify-it-py==2.0.3
+matplotlib==3.10.6
 myst-nb==1.3.0
 sphinx==8.2.3
-sphinx-click==6.0.0
+sphinx-click==6.1.0
 sphinx-copybutton==0.5.2
 sphinx-design==0.6.1

docs/tutorials/quickstart.ipynb

@@ -225,14 +225,16 @@ def docs_build(session: Session) -> None:
     session_install_uv_package(
         session,
         [
+            "aiohttp",
             "autodoc-pydantic",
+            "furo",
+            "linkify-it-py",
+            "matplotlib",
+            "myst-nb",
             "sphinx",
             "sphinx-click",
             "sphinx-copybutton",
             "sphinx-design",
-            "furo",
-            "myst-nb",
-            "linkify-it-py",
         ],
     )
 
@@ -251,15 +253,17 @@ def docs(session: Session) -> None:
     session_install_uv_package(
         session,
         [
+            "aiohttp",
             "autodoc-pydantic",
+            "furo",
+            "linkify-it-py",
+            "matplotlib",
+            "myst-nb",
             "sphinx",
             "sphinx-autobuild",
             "sphinx-click",
             "sphinx-copybutton",
             "sphinx-design",
-            "furo",
-            "myst-nb",
-            "linkify-it-py",
         ],
     )
 

noxfile.py

@@ -1,11 +1,12 @@
 [project]
 name = "multidimio"
-version = "1.0.0"
+version = "1.0.2"
 description = "Cloud-native, scalable, and user-friendly multi dimensional energy data!"
 authors = [{ name = "Altay Sansal", email = "[email protected]" }]
 requires-python = ">=3.11,<3.14"
 readme = "README.md"
-license = { "text" = "Apache-2.0" }
+license = "Apache-2.0"
+license-files = ["LICEN[CS]E*"]
 keywords = ["mdio", "multidimio", "seismic", "wind", "data"]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -17,25 +18,25 @@ classifiers = [
 ]
 
 dependencies = [
-    "click (>=8.2.1,<9.0.0)",
-    "click-params (>=0.5.0,<0.6.0)",
-    "dask (>=2025.7.0)",
-    "fsspec (>=2025.9.0)",
-    "pint>=0.25.0,<1.0.0",
-    "psutil (>=7.0.0,<8.0.0)",
-    "pydantic (>=2.11.7,<3.0.0)",
-    "rich (>=14.1.0,<15.0.0)",
-    "segy (>=0.4.2,<0.5.0)",
-    "tqdm (>=4.67.1,<5.0.0)",
+    "click>=8.2.1",
+    "click-params>=0.5.0",
+    "dask>=2025.9.0",
+    "fsspec>=2025.9.0",
+    "pint>=0.25.0",
+    "psutil>=7.0.0",
+    "pydantic>=2.11.9",
+    "rich>=14.1.0",
+    "segy>=0.5.0",
+    "tqdm>=4.67.1",
     "universal-pathlib>=0.2.6",
     "xarray>=2025.9.0",
-    "zarr (>=3.1.2,<4.0.0)",
+    "zarr>=3.1.2",
 ]
 
 [project.optional-dependencies]
-cloud = ["s3fs (>=2025.9.0)", "gcsfs (>=2025.9.0)", "adlfs (>=2025.8.0)"]
-distributed = ["distributed (>=2025.7.0)", "bokeh (>=3.8.0,<4.0.0)"]
-lossy = ["zfpy (>=1.0.1,<2.0.0)"]
+cloud = ["s3fs>=2025.9.0", "gcsfs>=2025.9.0", "adlfs>=2025.8.0"]
+distributed = ["distributed>=2025.9.0", "bokeh>=3.8.0"]
+lossy = ["zfpy>=1.0.1"]
 
 [project.urls]
 homepage = "https://mdio.dev/"
@@ -47,31 +48,34 @@ mdio = "mdio.__main__:main"
 
 [dependency-groups]
 dev = [
-    "ruff (>=0.12.2)",
-    "coverage[toml] (>=7.10.6,<8)",
-    "mypy (>=1.17.1,<2)",
-    "pre-commit (>=4.3.0,<5)",
-    "pre-commit-hooks (>=6.0.0,<7)",
-    "pytest (>=8.4.2,<9)",
-    "pytest-dependency (>=0.6.0,<0.7)",
-    "typeguard (>=4.4.4,<5)",
-    "xdoctest[colors] (>=1.2.0,<2)",
-    "Pygments (>=2.19.2,<3)",
+    "ruff>=0.13.0",
+    "coverage[toml]>=7.10.6",
+    "mypy>=1.18.1",
+    "pre-commit>=4.3.0",
+    "pre-commit-hooks>=6.0.0",
+    "pytest>=8.4.2",
+    "pytest-dependency>=0.6.0",
+    "typeguard>=4.4.4",
+    "xdoctest[colors]>=1.3.0",
+    "Pygments>=2.19.2"
 ]
 
 docs = [
-    "furo (>=2025.7.19)",
-    "linkify-it-py (>=2.0.3)",
-    "myst-nb (>=1.3.0)",
-    "sphinx (>=8.2.3,<9)",
-    "sphinx-autobuild (>=2025.8.25)",
-    "sphinx-click (>=6.0.0,<7)",
-    "sphinx-copybutton (>=0.5.2,<0.6)",
-    "sphinx-design (>=0.6.1,<0.7)",
+    "aiohttp>=3.12.15",
+    "autodoc-pydantic>=2.2.0",
+    "furo>=2025.7.19",
+    "linkify-it-py>=2.0.3",
+    "matplotlib>=3.10.6",
+    "myst-nb>=1.3.0",
+    "sphinx>=8.2.3",
+    "sphinx-autobuild>=2025.8.25",
+    "sphinx-click>=6.1.0",
+    "sphinx-copybutton>=0.5.2",
+    "sphinx-design>=0.6.1",
 ]
 
 [tool.uv]
-required-version = ">=0.8.15"
+required-version = ">=0.8.17"
 
 [tool.ruff]
 target-version = "py311"
@@ -177,7 +181,7 @@ init_typed = true
 warn_required_dynamic_aliases = true
 
 [tool.bumpversion]
-current_version = "1.0.0"
+current_version = "1.0.2"
 allow_dirty = true
 commit = false
 tag = false
@@ -187,6 +191,9 @@ serialize = [
     "{major}.{minor}.{patch}",          # For stable releases
 ]
 
+[tool.uv.build-backend]
+module-name = "mdio"
+
 [build-system]
-requires = ["setuptools", "wheel", "fastentrypoints"]
-build-backend = "setuptools.build_meta"
+requires = ["uv_build>=0.8.17,<0.9.0"]
+build-backend = "uv_build"

pyproject.toml

@@ -16,7 +16,7 @@
 KNOWN_MODULES = ["segy.py", "copy.py", "info.py"]
 
 
-class MyCLI(click.MultiCommand):
+class MyCLI(click.Group):
     """CLI generator via plugin design pattern.
 
     This class dynamically loads command modules from the specified `plugin_folder`. If the
@@ -26,8 +26,8 @@ class MyCLI(click.MultiCommand):
 
     Args:
         plugin_folder: Path to the directory containing command modules
-        *args: Variable length argument list passed to the click.MultiCommand.
-        **kwargs: Arbitrary keyword arguments passed to the click.MultiCommand.
+        *args: Variable length argument list passed to the click.Group.
+        **kwargs: Arbitrary keyword arguments passed to the click.Group.
     """
 
     def __init__(self, plugin_folder: Path, *args: Any, **kwargs: Any):  # noqa: ANN401

src/mdio/__main__.py

@@ -13,6 +13,7 @@
 from xarray.backends.api import to_zarr as xr_to_zarr
 
 from mdio.constants import ZarrFormat
+from mdio.core.zarr_io import zarr_warnings_suppress_unstable_structs_v3
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
@@ -51,11 +52,13 @@ def open_mdio(input_path: UPath | Path | str, chunks: T_Chunks = None) -> xr_Dat
     input_path = _normalize_path(input_path)
     storage_options = _normalize_storage_options(input_path)
     zarr_format = zarr.config.get("default_zarr_format")
+
     return xr_open_zarr(
         input_path.as_posix(),
         chunks=chunks,
         storage_options=storage_options,
         mask_and_scale=zarr_format == ZarrFormat.V3,  # off for v2, on for v3
+        consolidated=zarr_format == ZarrFormat.V2,  # on for v2, off for v3
     )
 
 
@@ -86,13 +89,15 @@ def to_mdio(  # noqa: PLR0913
     output_path = _normalize_path(output_path)
     storage_options = _normalize_storage_options(output_path)
     zarr_format = zarr.config.get("default_zarr_format")
-    xr_to_zarr(
-        dataset,
-        store=output_path.as_posix(),  # xarray doesn't like URI when file:// is protocol
-        mode=mode,
-        compute=compute,
-        consolidated=zarr_format == ZarrFormat.V2,  # off for v3, on for v2
-        region=region,
-        storage_options=storage_options,
-        write_empty_chunks=False,
-    )
+
+    with zarr_warnings_suppress_unstable_structs_v3():
+        xr_to_zarr(
+            dataset,
+            store=output_path.as_posix(),  # xarray doesn't like URI when file:// is protocol
+            mode=mode,
+            compute=compute,
+            consolidated=zarr_format == ZarrFormat.V2,  # on for v2, off for v3
+            region=region,
+            storage_options=storage_options,
+            write_empty_chunks=False,
+        )

src/mdio/api/io.py

@@ -10,7 +10,7 @@
 from mdio.builder.schemas.units import create_unit_model
 
 ureg = UnitRegistry()
-ureg.default_format = "~C"  # compact, abbreviated (symbol).
+ureg.formatter.default_format = "~C"  # compact, abbreviated (symbol).
 
 
 class LengthUnitEnum(UnitEnum):

src/mdio/builder/schemas/v1/units.py

@@ -222,7 +222,7 @@ def to_xarray_dataset(mdio_ds: Dataset) -> xr_Dataset:  # noqa: PLR0912
 
         encoding = {
             "chunks": original_chunks,
-            "compressor": _convert_compressor(v.compressor),
+            "compressors": _convert_compressor(v.compressor),
             fill_value_key: fill_value,
         }