doppy 0.1.0__tar.gz → 0.1.2__tar.gz

{doppy-0.1.0 → doppy-0.1.2}/Cargo.lock

@@ -106,7 +106,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "doppy_rs"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
  "doprs",
  "numpy",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "doprs"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
  "chrono",
  "rayon",

{doppy-0.1.0 → doppy-0.1.2}/Cargo.toml

@@ -4,6 +4,6 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.1.0"
+version = "0.1.2"
 authors = ["Niko Leskinen <niko.leskinen@fmi.fi>"]
 license-file = "LICENSE"

{doppy-0.1.0 → doppy-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: doppy
-Version: 0.1.0
+Version: 0.1.2
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Requires-Dist: requests
 Requires-Dist: urllib3
 Requires-Dist: numpy
-Requires-Dist: netCDF4
+Requires-Dist: netcdf4
 Requires-Dist: typer[all]
 Requires-Dist: matplotlib
 Requires-Dist: scikit-learn
@@ -22,13 +22,12 @@ Requires-Dist: ruff ; extra == 'dev'
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: types-requests ; extra == 'dev'
 Requires-Dist: py-spy ; extra == 'dev'
-Requires-Dist: maturin ; extra == 'dev'
+Requires-Dist: maturin ==1.4 ; extra == 'dev'
 Requires-Dist: release-version ; extra == 'dev'
 Requires-Dist: pre-commit ; extra == 'dev'
 Provides-Extra: dev
 License-File: LICENSE
 License-File: LICENSE
-Summary: Doppler lidar processing
 Author: Niko Leskinen <niko.leskinen@fmi.fi>
 Author-email: Niko Leskinen <niko.leskinen@fmi.fi>
 Requires-Python: >=3.10

{doppy-0.1.0 → doppy-0.1.2}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["maturin>=1.4,<2.0"]
+requires = ["maturin>=1.5,<2.0"]
 build-backend = "maturin"
 
 [project]
 name = "doppy"
-description = "Doppler lidar processing"
+summary = "Doppler lidar processing"
 dynamic = ["version"]
 authors = [{name = "Niko Leskinen", email = "niko.leskinen@fmi.fi"}]
 requires-python = ">=3.10"
@@ -32,7 +32,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["mypy", "ruff", "pytest", "types-requests", "py-spy", "maturin", "release-version", "pre-commit"]
+dev = ["mypy", "ruff", "pytest", "types-requests", "py-spy", "maturin==1.4", "release-version", "pre-commit"]
 
 [project.scripts]
 doppy = "doppy.__main__:app"

{doppy-0.1.0 → doppy-0.1.2}/src/doppy/netcdf.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from pathlib import Path
 from typing import Literal, TypeAlias
 
 import netCDF4
@@ -11,13 +10,17 @@ NetCDFDataType: TypeAlias = Literal["f4", "f8", "i4", "i8", "u4", "u8"]
 
 
 class Dataset:
-    def __init__(self) -> None:
-        self.nc = netCDF4.Dataset("inmemory.nc", mode="w", memory=1028)
+    def __init__(self, filename: str) -> None:
+        self.nc = netCDF4.Dataset(filename, mode="w")
 
     def add_dimension(self, dim: str) -> Dataset:
         self.nc.createDimension(dim, None)
         return self
 
+    def add_atribute(self, key: str, val: str) -> Dataset:
+        setattr(self.nc, key, val)
+        return self
+
     def add_time(
         self,
         name: str,
@@ -28,7 +31,7 @@ class Dataset:
         long_name: str | None = None,
     ) -> Dataset:
         time, units, calendar = _convert_time(data)
-        var = self.nc.createVariable(name, dtype, dimensions)
+        var = self.nc.createVariable(name, dtype, dimensions, compression="zlib")
         var.units = units
         var.calendar = calendar
         var[:] = time
@@ -49,7 +52,10 @@ class Dataset:
         long_name: str | None = None,
         mask: npt.NDArray[np.bool_] | None = None,
     ) -> Dataset:
-        var = self.nc.createVariable(name, dtype, dimensions)
+        fill_value = netCDF4.default_fillvals[dtype] if mask is not None else None
+        var = self.nc.createVariable(
+            name, dtype, dimensions, fill_value=fill_value, compression="zlib"
+        )
         var.units = units
         if mask is not None:
             var[:] = np.ma.masked_array(data, mask)  # type: ignore
@@ -80,16 +86,8 @@ class Dataset:
             var.long_name = long_name
         return self
 
-    def close(self) -> memoryview:
-        buf = self.nc.close()
-        if isinstance(buf, memoryview):
-            return buf
-        raise TypeError
-
-    def write(self, path: str | Path) -> None:
-        buf = self.nc.close()
-        with Path(path).open("wb") as f:
-            f.write(buf)
+    def close(self) -> None:
+        self.nc.close()
 
 
 def _convert_time(

{doppy-0.1.0 → doppy-0.1.2}/src/doppy/product/wind.py

@@ -311,7 +311,8 @@ def _select_raws_for_wind(
         raw
         for raw in raws
         if len(raw.elevation_angles) == 1
-        and next(iter(raw.elevation_angles)) < 80
+        and (el := next(iter(raw.elevation_angles))) < 80
+        and el > 25
         and len(raw.azimuth_angles) > 3
     ]
     if len(raws_wind) == 0:
@@ -319,6 +320,7 @@ def _select_raws_for_wind(
             "No data suitable for winds: "
             "Multiple elevation angles or "
             "elevation angle >= 80 or "
+            "elevation angle <= 25 or "
             "no more than 3 azimuth angles"
         )