cloudnetpy 1.69.6__tar.gz → 1.69.8__tar.gz

{cloudnetpy-1.69.6/cloudnetpy.egg-info → cloudnetpy-1.69.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.69.6
+Version: 1.69.8
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -36,13 +36,14 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cloudnetpy_qc>=1.15.0
 Requires-Dist: matplotlib
-Requires-Dist: mwrpy>=0.4.3
+Requires-Dist: mwrpy>=1.2.0
 Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5

{cloudnetpy-1.69.6 → cloudnetpy-1.69.8}/cloudnetpy/instruments/hatpro.py

@@ -31,7 +31,7 @@ def hatpro2l1c(
     output_file: str,
     site_meta: dict,
     uuid: str | None = None,
-    date: str | None = None,
+    date: datetime.date | str | None = None,
 ) -> str:
     """Converts RPG HATPRO microwave radiometer data into Cloudnet Level 1c netCDF file.
 
@@ -45,7 +45,11 @@ def hatpro2l1c(
     Returns:
         UUID of the generated file.
     """
+    if isinstance(date, str):
+        date = datetime.date.fromisoformat(date)
+
     coeff_files = site_meta.get("coefficientFiles")
+    time_offset = site_meta.get("time_offset")
 
     try:
         hatpro_raw = lev1_to_nc(
@@ -54,6 +58,8 @@ def hatpro2l1c(
             output_file=output_file,
             coeff_files=coeff_files,
             instrument_config=site_meta,
+            date=date,
+            time_offset=time_offset,
         )
     except MissingInputData as err:
         raise HatproDataError(str(err)) from err
@@ -73,7 +79,7 @@ def hatpro2l1c(
             msg = "Timestamps are not increasing"
             raise RuntimeError(msg)
         dates = [
-            str(datetime.datetime.fromtimestamp(t, tz=datetime.timezone.utc).date())
+            datetime.datetime.fromtimestamp(t, tz=datetime.timezone.utc).date()
             for t in timestamps
         ]
         if len(set(dates)) != 1:
@@ -119,7 +125,7 @@ class HatproL1c:
     def __init__(self, hatpro, site_meta: dict):
         self.raw_data = hatpro.raw_data
         self.data = hatpro.data
-        self.date = hatpro.date.split("-")
+        self.date = hatpro.date.isoformat().split("-")
         self.site_meta = site_meta
         self.instrument = HATPRO
 

{cloudnetpy-1.69.6 → cloudnetpy-1.69.8}/cloudnetpy/instruments/weather_station.py

@@ -59,6 +59,8 @@ def ws2nc(
             ws = GalatiWS(weather_station_file, site_meta)
         elif site_meta["name"] == "Jülich":
             ws = JuelichWS(weather_station_file, site_meta)
+        elif site_meta["name"] == "Lampedusa":
+            ws = LampedusaWS(weather_station_file, site_meta)
         else:
             msg = "Unsupported site"
             raise ValueError(msg)  # noqa: TRY301
@@ -486,3 +488,57 @@ class JuelichWS(WS):
                 data[keymap[key]].append(parsed)
 
         return self.format_data(data)
+
+
+class LampedusaWS(WS):
+    """Read Lampedusa weather station data in ICOS format."""
+
+    def __init__(self, filenames: list[str], site_meta: dict):
+        super().__init__(site_meta)
+        self.filename = filenames[0]
+        self._data = self._read_data()
+
+    def _read_data(self) -> dict:
+        with open(self.filename, newline="") as f:
+            fields = [
+                "time",
+                "str1",
+                "str2",
+                "T",
+                "RH",
+                "Td",
+                "P",
+                "WSi",
+                "WDi",
+                "WS10m",
+                "WD10m",
+                "rain1m",
+                "rain2h",
+                "empty",
+            ]
+            reader = csv.DictReader(f, fieldnames=fields)
+            raw_data: dict = {key: [] for key in fields}
+            for row in reader:
+                for key, value in row.items():
+                    parsed_value: float | datetime.datetime
+                    if key == "time":
+                        parsed_value = datetime.datetime.strptime(
+                            value, "%y%m%d %H%M%S"
+                        )
+                    else:
+                        try:
+                            parsed_value = float(value)
+                        except ValueError:
+                            parsed_value = math.nan
+                    raw_data[key].append(parsed_value)
+
+        data = {
+            "time": raw_data["time"],
+            "air_temperature": raw_data["T"],
+            "relative_humidity": raw_data["RH"],
+            "air_pressure": raw_data["P"],
+            "wind_speed": raw_data["WSi"],
+            "wind_direction": raw_data["WDi"],
+            "rainfall_rate": raw_data["rain1m"],
+        }
+        return self.format_data(data)

{cloudnetpy-1.69.6 → cloudnetpy-1.69.8}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 69
-PATCH = 6
+PATCH = 8
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.69.6 → cloudnetpy-1.69.8/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.69.6
+Version: 1.69.8
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -36,13 +36,14 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cloudnetpy_qc>=1.15.0
 Requires-Dist: matplotlib
-Requires-Dist: mwrpy>=0.4.3
+Requires-Dist: mwrpy>=1.2.0
 Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5

{cloudnetpy-1.69.6 → cloudnetpy-1.69.8}/cloudnetpy.egg-info/requires.txt

@@ -1,6 +1,6 @@
 cloudnetpy_qc>=1.15.0
 matplotlib
-mwrpy>=0.4.3
+mwrpy>=1.2.0
 netCDF4
 requests
 rpgpy>=0.14.5

{cloudnetpy-1.69.6 → cloudnetpy-1.69.8}/pyproject.toml

@@ -13,12 +13,13 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Topic :: Scientific/Engineering",
 ]
 dependencies = [
   "cloudnetpy_qc>=1.15.0",
   "matplotlib",
-  "mwrpy>=0.4.3",
+  "mwrpy>=1.2.0",
   "netCDF4",
   "requests",
   "rpgpy>=0.14.5",
@@ -51,7 +52,7 @@ Changelog = "https://github.com/actris-cloudnet/cloudnetpy/blob/main/CHANGELOG.m
 check_untyped_defs = true
 
 [[tool.mypy.overrides]]
-module = ["matplotlib.*", "mpl_toolkits.*", "netCDF4.*", "scipy.*", "skimage.*", "voodoonet.*"]
+module = ["mpl_toolkits.*", "scipy.*", "voodoonet.*"]
 ignore_missing_imports = true
 
 [tool.release-version]