cloudnetpy 1.80.3__tar.gz → 1.80.4__tar.gz

{cloudnetpy-1.80.3/cloudnetpy.egg-info → cloudnetpy-1.80.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.80.3
+Version: 1.80.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/categorize/attenuations/melting_attenuation.py

@@ -29,6 +29,7 @@ def calc_melting_attenuation(
         )
 
     rainfall_rate = data.disdrometer.data["rainfall_rate"][:]
+    rainfall_rate[is_rain == 0] = ma.masked
     frequency = data.radar.radar_frequency
 
     attenuation_array = _calc_melting_attenuation(rainfall_rate, frequency)

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/categorize/categorize.py

@@ -240,7 +240,7 @@ def _save_cat(
             extra=extra_references,
         )
         if is_voodoo:
-            import voodoonet.version
+            import voodoonet.version  # noqa: PLC0415
 
             nc.voodoonet_version = voodoonet.version.__version__
         output.add_source_instruments(nc, data_obs)
@@ -325,8 +325,7 @@ COMMENTS = {
         "have\n a reflectivity of 0 dBZ at all frequencies."
     ),
     "bias": (
-        "This variable is an estimate of the one-standard-deviation\n"
-        "calibration error."
+        "This variable is an estimate of the one-standard-deviation\ncalibration error."
     ),
     "insect_prob": (
         "Ad-hoc estimation of the probability that the pixel contains insects."

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/categorize/classify.py

@@ -64,10 +64,9 @@ def classify_measurements(data: Observations) -> ClassificationResult:
         if "rpg-fmcw-94" not in obs.radar_type.lower():
             msg = "VoodooNet is only implemented for RPG-FMCW-94 radar."
             raise NotImplementedError(msg)
-        import voodoonet
-        from voodoonet.utils import VoodooOptions
+        import voodoonet  # noqa: PLC0415
 
-        options = VoodooOptions(progress_bar=False)
+        options = voodoonet.VoodooOptions(progress_bar=False)
         target_time = voodoonet.utils.decimal_hour2unix(obs.date, obs.time)
         liquid_prob = voodoonet.infer(
             obs.lv0_files, target_time=target_time, options=options

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/categorize/melting.py

@@ -151,7 +151,7 @@ def _find_melting_layer_from_v(
             v_prof[base] < -2,
         ]
     if all(conditions):
-        base = int(round(top - (top - base) / 2))
+        base = round(top - (top - base) / 2)
         return np.arange(base, top)
     return None
 

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/categorize/mwr.py

@@ -45,6 +45,6 @@ class Mwr(DataSource):
         self.data["lwp_error"].comment = (
             "This variable is a rough estimate of the one-standard-deviation\n"
             f"error in liquid water path, calculated as a combination of\n"
-            f"a {bias} g m-2 linear error and a {round(random_error*100)} %\n"
+            f"a {bias} g m-2 linear error and a {round(random_error * 100)} %\n"
             "fractional error."
         )

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/cli.py

@@ -519,7 +519,7 @@ def _process_mwrpy_product(
     filename = f"{args.date}_{args.site}_{product}.nc"
     output_file = _create_output_folder("geophysical", args) / filename
     module = importlib.import_module("cloudnetpy.products")
-    getattr(module, f"generate_{product.replace('-','_')}")(mwr_l1c_file, output_file)
+    getattr(module, f"generate_{product.replace('-', '_')}")(mwr_l1c_file, output_file)
     logging.info("Processed %s: %s", product, output_file)
     return str(output_file)
 

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/instruments/fd12p.py

@@ -107,9 +107,9 @@ class FD12P(CSVFile):
             logging.info("Skipped %d lines", invalid_lines)
         for key in ("visibility", "synop_WaWa", "snowfall_amount"):
             values = np.array(
-                [0 if x is math.nan else x for x in self._data[key]], dtype=np.int32
+                [0 if math.isnan(x) else x for x in self._data[key]], dtype=np.int32
             )
-            mask = np.array([x is math.nan for x in self._data[key]])
+            mask = np.array([math.isnan(x) for x in self._data[key]])
             self._data[key] = ma.array(values, mask=mask)
         self._data["snowfall_amount"] = self._data["snowfall_amount"].astype(np.float32)
         if expected_date:

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/instruments/rpg.py

@@ -156,10 +156,8 @@ def _mask_invalid_data(data_in: dict) -> dict:
     fill_values = (-999, 1e-10)
     extra_keys = ("air_temperature", "air_pressure")
     for name in data:
-        if (
-            np.issubdtype(data[name].dtype, np.integer)
-            or data[name].ndim < 2
-            and name not in extra_keys
+        if np.issubdtype(data[name].dtype, np.integer) or (
+            data[name].ndim < 2 and name not in extra_keys
         ):
             continue
         data[name] = ma.masked_equal(data[name], 0)

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/instruments/rpg_reader.py

@@ -242,7 +242,7 @@ class HatproBinLwp(HatproBin):
         elif self.header["file_code"] == 934501000:
             self.version = 2
         else:
-            msg = f'Unknown HATPRO version. {self.header["file_code"]}'
+            msg = f"Unknown HATPRO version. {self.header['file_code']}"
             raise ValueError(msg)
 
     def _read_data(self, file) -> None:
@@ -281,7 +281,7 @@ class HatproBinIwv(HatproBin):
         elif self.header["file_code"] == 594811000:
             self.version = 2
         else:
-            msg = f'Unknown HATPRO version. {self.header["file_code"]}'
+            msg = f"Unknown HATPRO version. {self.header['file_code']}"
             raise ValueError(msg)
 
     def _read_data(self, file) -> None:

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/instruments/weather_station.py

@@ -626,7 +626,7 @@ def _parse_sirta(filename: str | PathLike):
         if m is None:
             continue
         if m[1] != str(len(columns) + 1):
-            msg = f"Expected column {m[1]}, found {len(columns)+1}"
+            msg = f"Expected column {m[1]}, found {len(columns) + 1}"
             raise ValueError(msg)
         columns.append(m[2])
         output[m[2]] = []

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/model_evaluation/plotting/plot_tools.py

@@ -14,10 +14,7 @@ def parse_wanted_names(
     advance: bool = False,
 ) -> tuple[list, list]:
     """Returns standard and advection lists of product types to plot."""
-    if variables:
-        names = variables
-    else:
-        names = parse_dataset_keys(nc_file, name, advance=advance, model=model)
+    names = variables or parse_dataset_keys(nc_file, name, advance=advance, model=model)
     standard_n = [n for n in names if name in n and "adv" not in n]
     standard_n = sort_model2first_element(standard_n, model)
     advection_n = [n for n in names if name in n and "adv" in n]

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/plotting/plotting.py

@@ -100,10 +100,10 @@ class Dimensions:
             .translated(-tightbbox.x0, -tightbbox.y0)
             .extents
         )
-        self.margin_top = int(self.height - round(y1))
-        self.margin_right = int(self.width - round(x1) - 1)
-        self.margin_bottom = int(round(y0) - 1)
-        self.margin_left = int(round(x0))
+        self.margin_top = self.height - round(y1)
+        self.margin_right = self.width - round(x1) - 1
+        self.margin_bottom = round(y0) - 1
+        self.margin_left = round(x0)
 
 
 class FigureData:

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/products/epsilon.py

@@ -174,7 +174,7 @@ def _infer_pulse_repetition_frequency(range_: npt.NDArray[np.float64]):
         return 15e3
     if round_trip_time / T_LOW < 1:
         return 10e3
-    msg = f"Suspiciously large range ({dist}m). " "Cannot infer pulse repetition rate"
+    msg = f"Suspiciously large range ({dist}m). Cannot infer pulse repetition rate"
     raise ValueError(msg)
 
 

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 80
-PATCH = 3
+PATCH = 4
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.80.3
+Version: 1.80.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.80.3 → cloudnetpy-1.80.4}/pyproject.toml

@@ -80,9 +80,11 @@ ignore = [
   "DTZ00", # do not check timezone info
   "FIX002", # TODOs
   "ISC001", # Formatter wants me
+  "LOG015", # call on root logger
   "N8", # uppercase variable names
   "PD011", # false positive
   "PERF", # try except in loop
+  "PLC0206", # dict.items not used
   "PLR", # too many arguments etc.
   "PTH", # use pathlib, fix me later
   "RUF002", # unicode in doc string