Merge pull request #232 from umr-lops/replace-datatree-by-array

Replace `xarray-datatree` by `xarray.datatree`

.pre-commit-config.yaml

@@ -0,0 +1,41 @@
+ci:
+  autoupdate_schedule: monthly
+
+# https://pre-commit.com/
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-docstring-first
+  - repo: https://github.com/psf/black
+    rev: 24.10.0
+    hooks:
+      - id: black
+  - repo: https://github.com/keewis/blackdoc
+    rev: v0.3.9
+    hooks:
+      - id: blackdoc
+        additional_dependencies: ["black==24.10.0"]
+      - id: blackdoc-autoupdate-black
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.7.1
+    hooks:
+      - id: ruff
+        args: [--fix]
+  - repo: https://github.com/kynan/nbstripout
+    rev: 0.7.1
+    hooks:
+      - id: nbstripout
+        args: [--extra-keys=metadata.kernelspec metadata.language_info.version]
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.3.3
+    hooks:
+      - id: prettier
+  - repo: https://github.com/ComPWA/taplo-pre-commit
+    rev: v0.9.3
+    hooks:
+      - id: taplo-format
+      - id: taplo-lint
+        args: [--no-schema]

requirements.txt

@@ -12,5 +12,4 @@ matplotlib
 packaging
 pytest
 dill
-xarray-datatree
 lxml

setup.py

@@ -14,13 +14,12 @@
         'GDAL',
         'dask[array]',
         'distributed',
-        'xarray',
+        "xarray>=2024.10.0",
         'affine',
         'rasterio',
         'cartopy',
         'fiona',
         'pyproj',
-        'xarray-datatree>=0.0.9',
         'numpy',
         'scipy',
         'shapely',

src/xsar/__init__.py

@@ -1,4 +1,21 @@
-__all__ = ['open_dataset', 'product_info', 'Sentinel1Meta', 'Sentinel1Dataset', 'RadarSat2Dataset', 'RadarSat2Meta', 'RcmMeta', 'RcmDataset', 'BaseDataset', 'BaseMeta']
+__all__ = [
+    # "open_dataset",
+    # "product_info",
+    "Sentinel1Meta",
+    "Sentinel1Dataset",
+    "RadarSat2Dataset",
+    "RadarSat2Meta",
+    "RcmMeta",
+    "RcmDataset",
+    "BaseDataset",
+    "BaseMeta",
+]
 
-from .xsar import *
-from .xsar import __version__
+from xsar.radarsat2_dataset import RadarSat2Dataset
+from xsar.sentinel1_dataset import Sentinel1Dataset
+from xsar.sentinel1_meta import Sentinel1Meta
+from rcm_meta import RcmMeta
+from xsar.radarsat2_meta import RadarSat2Meta
+from xsar.rcm_dataset import RcmDataset
+from xsar.base_dataset import BaseDataset
+from xsar.base_meta import BaseMeta