Merge branch 'dev' of https://github.com/MeteoSwiss/pyart into dev

Author: Guidicel

.pre-commit-config.yaml

@@ -1,10 +1,18 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0  # Use the latest stable version
+    rev: v5.0.0  # Use the latest stable version
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
+
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.9.3  # Use the latest stable version of ruff-pre-commit
+    hooks:
+      - id: ruff
+        args: ["--fix"]
+        files: "pyart"  # Automatically fix issues when possible
+
   - repo: https://github.com/psf/black
     rev: 23.1.0
     hooks:

=0.8.0

@@ -533,6 +533,7 @@ def read_metranet_c(
         radar_id = ret.header["RadarName"].decode("utf-8")
 
     metadata["instrument_name"] = radar_id
+    metadata["sweep_quality"] = ret.header["quality"]
 
     # hardcoded radar dependent metadata
     latitude["data"] = np.array([ret.header["RadarLat"]], dtype=dtype)
@@ -993,6 +994,7 @@ def read_metranet_python(
         radar_id = ret.header["radarname"].decode("utf-8")
 
     metadata["instrument_name"] = radar_id
+    metadata["sweep_quality"] = ret.header["quality"]
 
     # hardcoded radar dependent metadata
     latitude["data"] = np.array([ret.header["radarlat"]], dtype=dtype)
@@ -1034,7 +1036,6 @@ def read_metranet_python(
     for i in range(0, nmoments):
         field_name = filemetadata.get_field_name(momnames[i])
         if field_name is not None:
-
             # create field dictionary
             field_dic = filemetadata(field_name)
             if momnames[i] not in ret.data:

pyart/aux_io/metranet_reader.py

@@ -287,20 +287,35 @@ def add_field(self, field_name, dic, replace_existing=False):
             raise ValueError(err)
         if "data" not in dic:
             raise KeyError("dic must contain a 'data' key")
-        if dic["data"].shape != (self.nrays, self.ngates, self.npulses_max):
-            t = (
-                self.nrays,
-                self.ngates,
-                self.npulses_max,
-                dic["data"].shape[0],
-                dic["data"].shape[1],
-                dic["data"].shape[2],
-            )
-            err = (
-                "'data' has invalid shape, "
-                + f"should be ({t[0]}, {t[1]}, {t[2]}) but is ({t[3]}, {t[4]}, {t[5]})"
-            )
-            raise ValueError(err)
+        # Check if field is in spectral shape (self.nrays, self.ngates, self.npulses_max)
+        if len(dic["data"]) == 3:
+            if dic["data"].shape != (self.nrays, self.ngates, self.npulses_max):
+                t = (
+                    self.nrays,
+                    self.ngates,
+                    self.npulses_max,
+                    dic["data"].shape[0],
+                    dic["data"].shape[1],
+                    dic["data"].shape[2],
+                )
+                err = (
+                    "'data' has invalid shape, "
+                    + f"should be ({t[0]}, {t[1]}, {t[2]}) but is ({t[3]}, {t[4]}, {t[5]})"
+                )
+                raise ValueError(err)
+        elif len(dic["data"]) == 2:
+            if dic["data"].shape != (self.nrays, self.ngates):
+                t = (
+                    self.nrays,
+                    self.ngates,
+                    dic["data"].shape[0],
+                    dic["data"].shape[1],
+                )
+                err = (
+                    "'data' has invalid shape, "
+                    + f"should be ({t[0]}, {t[1]}) but is ({t[2]}, {t[3]})"
+                )
+                raise ValueError(err)
         # add the field
         self.fields[field_name] = dic
 

pyart/core/radar_spectra.py

@@ -777,7 +777,6 @@ def visibility(
             rrmax = rr + dr / 2
 
             if np.any(indseta):
-
                 indsetr = np.logical_and(rmap[indseta] >= rrmin, rmap[indseta] < rrmax)
 
                 indsetr = tuple(

pyart/retrieve/_gecsx_functions.py

@@ -74,7 +74,7 @@
 PLATFORMS = ["Linux", "Mac OS-X", "Unix"]
 MAJOR = 2
 MINOR = 0
-MICRO = 3
+MICRO = 4
 ISRELEASED = False
 VERSION = f"{int(MAJOR)}.{int(MINOR)}.{int(MICRO)}"
 SCRIPTS = glob.glob("scripts/*")