xarray-selafin 0.2.1__tar.gz → 0.2.3__tar.gz

{xarray_selafin-0.2.1 → xarray_selafin-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xarray-selafin
-Version: 0.2.1
+Version: 0.2.3
 Summary: 
 Author: tomsail
 Author-email: saillour.thomas@gmail.com
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: numpy
+Requires-Dist: python-serafin (>=0.2,<0.3)
 Requires-Dist: xarray
 Project-URL: Repository, https://github.com/oceanmodeling/xarray-selafin/
 Description-Content-Type: text/markdown

{xarray_selafin-0.2.1 → xarray_selafin-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xarray-selafin"
-version = "0.2.1"
+version = "0.2.3"
 description = ""
 authors = ["tomsail <saillour.thomas@gmail.com>", "lucduron <l.duron@cnr.tm.fr>"]
 readme = "README.md"
@@ -14,6 +14,7 @@ include = [
 python = ">=3.11"
 numpy = "*"
 xarray = "*"
+python-serafin = ">=0.2,<0.3"
 
 [tool.poetry.plugins."xarray.backends"]
 selafin = "xarray_selafin.xarray_backend:SelafinBackendEntrypoint"
@@ -33,5 +34,8 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]
-target-version = ['py37']
+target-version = ['py311']
 line-length = 107
+
+[tool.ruff.isort]
+force-single-line = true

{xarray_selafin-0.2.1 → xarray_selafin-0.2.3}/xarray_selafin/xarray_backend.py

@@ -4,20 +4,26 @@ Documentation on how to implement a new backend in xarray
 * https://tutorial.xarray.dev/advanced/backends/2.Backend_with_Lazy_Loading.html
 """
 import os
+import threading
 from datetime import datetime
 from datetime import timedelta
-import numpy as np
 from operator import attrgetter
-import threading
+
+import numpy as np
 import xarray as xr
-from xarray.backends import BackendArray, BackendEntrypoint
+from serafin import SerafinHeader
+from serafin import SerafinReader
+from serafin import SerafinRequestError
+from serafin import SerafinWriter
+from serafin.serafin import LANG
+from serafin.serafin import SLF_EIT
+from xarray.backends import BackendArray
+from xarray.backends import BackendEntrypoint
 from xarray.core import indexing
 
-from xarray_selafin import Serafin
-
-
 try:
     import dask
+
     DASK_AVAILABLE = True
 except ImportError:
     DASK_AVAILABLE = False
@@ -40,7 +46,7 @@ def compute_duration_between_datetime(t0, time_serie):
 
 
 def read_serafin(filepath, lang):
-    resin = Serafin.Read(filepath, lang)
+    resin = SerafinReader(filepath, lang)
     resin.__enter__()
     resin.read_header()
     resin.get_time()
@@ -48,7 +54,6 @@ def read_serafin(filepath, lang):
 
 
 class SelafinLazyArray(BackendArray):
-
     def __init__(self, filename_or_obj, shape, dtype, lock, var):
         self.filename_or_obj = filename_or_obj
         self.shape = shape
@@ -134,7 +139,6 @@ class SelafinLazyArray(BackendArray):
 
 
 class SelafinBackendEntrypoint(BackendEntrypoint):
-
     def open_dataset(
         self,
         filename_or_obj,
@@ -144,7 +148,7 @@ class SelafinBackendEntrypoint(BackendEntrypoint):
         # Below are custom arguments
         disable_lock=False,
         lazy_loading=True,
-        lang=Serafin.LANG,
+        lang=LANG,
         # `chunks` and `cache` DO NOT go here, they are handled by xarray
     ):
         # Initialize SELAFIN reader
@@ -160,7 +164,7 @@ class SelafinBackendEntrypoint(BackendEntrypoint):
         nplan = slf.header.nb_planes
         x = slf.header.x
         y = slf.header.y
-        vars = slf.header.var_IDs
+        vars = slf.header.var_ids
 
         # Create data variables
         data_vars = {}
@@ -218,7 +222,7 @@ class SelafinBackendEntrypoint(BackendEntrypoint):
 
         ds.set_close(close)
 
-        ds.attrs["title"] = slf.header.title.decode(Serafin.SLF_EIT).strip()
+        ds.attrs["title"] = slf.header.title.decode(SLF_EIT).strip()
         ds.attrs["language"] = slf.header.language
         ds.attrs["float_size"] = slf.header.float_size
         ds.attrs["endian"] = slf.header.endian
@@ -228,7 +232,7 @@ class SelafinBackendEntrypoint(BackendEntrypoint):
         if not is_2d:
             ds.attrs["ikle3"] = np.reshape(slf.header.ikle, (slf.header.nb_elements, ndp3))
         ds.attrs["variables"] = {
-            var_ID: (name.decode(Serafin.SLF_EIT).rstrip(), unit.decode(Serafin.SLF_EIT).rstrip())
+            var_ID: (name.decode(SLF_EIT).rstrip(), unit.decode(SLF_EIT).rstrip())
             for var_ID, name, unit in slf.header.iter_on_all_variables()
         }
         ds.attrs["date_start"] = slf.header.date
@@ -249,7 +253,6 @@ class SelafinBackendEntrypoint(BackendEntrypoint):
 
 @xr.register_dataset_accessor("selafin")
 class SelafinAccessor:
-
     def __init__(self, xarray_obj):
         self._ds = xarray_obj
         self._header = None
@@ -279,7 +282,7 @@ class SelafinAccessor:
 
         # Title
         title = ds.attrs.get("title", "Converted with array-serafin")
-        header = Serafin.SerafinHeader(title)
+        header = SerafinHeader(title)
 
         # File precision
         float_size = ds.attrs.get("float_size", 4)  # Default: single precision
@@ -311,17 +314,17 @@ class SelafinAccessor:
                 header.date = DEFAULT_DATE_START
 
         # Variables
-        header.language = ds.attrs.get("language", Serafin.LANG)
+        header.language = ds.attrs.get("language", LANG)
         for var in ds.data_vars:
             try:
                 name, unit = ds.attrs["variables"][var]
                 header.add_variable_str(var, name, unit)
             except KeyError:
                 try:
-                    header.add_variable_from_ID(var)
-                except Serafin.SerafinRequestError:
+                    header.add_variable_from_id(var)
+                except SerafinRequestError:
                     header.add_variable_str(var, var, "?")
-        header.nb_var = len(header.var_IDs)
+        header.nb_var = len(header.var_ids)
 
         if "plan" in ds.dims:  # 3D
             header.is_2d = False
@@ -376,7 +379,7 @@ class SelafinAccessor:
         """Writes header and all data frames into output file"""
         header = self._header
 
-        with Serafin.Write(filepath, header.language, overwrite=True) as resout:
+        with SerafinWriter(filepath, header.language, overwrite=True) as resout:
             resout.write_header(header)
 
             t0 = np.datetime64(datetime(*header.date))
@@ -391,7 +394,7 @@ class SelafinAccessor:
             shape = (header.nb_var, header.nb_nodes)
             values = np.empty(shape, dtype=header.np_float_type)
             for time_index, time in enumerate(time_serie):
-                for var_index, var in enumerate(header.var_IDs):
+                for var_index, var in enumerate(header.var_ids):
                     if header.nb_frames in (0, 1):
                         array = self._ds[var].values
                     else: