Merge pull request #425 from DimitriPapadopoulos/sourcery

Apply Sourcery suggestions

Author: FrancescAlted

src/blosc2/core.py

@@ -1092,9 +1092,7 @@ def detect_number_of_cores() -> int:
 # Dictionaries for the maps between compressor names and libs
 codecs = compressor_list(plugins=True)
 # Map for compression libraries and versions
-clib_versions = {}
-for codec in compressor_list(plugins=False):
-    clib_versions[codec.name] = clib_info(codec)[1].decode("utf-8")
+clib_versions = {codec.name: clib_info(codec)[1].decode("utf-8") for codec in compressor_list(plugins=False)}
 
 
 def os_release_pretty_name():
@@ -1422,15 +1420,14 @@ def compute_partition(nitems, maxshape, minpart=None):
         if rsize <= max_items:
             # rsize = rsize if size % rsize == 0 else nearest_divisor(size, rsize)
             rsize = rsize if size % rsize == 0 else blosc2_ext.nearest_divisor(size, rsize)
-            partition[-(i + 1)] = rsize
         else:
             rsize = max(max_items, minsize)
             # new_rsize = rsize if size % rsize == 0 else nearest_divisor(size, rsize, strict=True)
             new_rsize = rsize if size % rsize == 0 else blosc2_ext.nearest_divisor(size, rsize, strict=True)
             # If the new rsize is not too far from the original rsize, use it
             if rsize // 2 < new_rsize < rsize * 2:
                 rsize = new_rsize
-            partition[-(i + 1)] = rsize
+        partition[-(i + 1)] = rsize
         max_items //= rsize
 
     return partition

src/blosc2/helpers.py

@@ -32,7 +32,7 @@ def wrapper(child_func):
                     # Next parameter starts, stop copying lines
                     break
                 matching_lines.append(line)
-        assert len(matching_lines) > 0, (
+        assert matching_lines, (
             f"Could not extract the parameter {parameter} from the docstring of {parent_func.__name__}"
         )
 

src/blosc2/lazyexpr.py

@@ -657,7 +657,7 @@ def conserve_functions(  # noqa: C901
     expression: str,
     operands_old: dict[str, blosc2.NDArray | blosc2.LazyExpr],
     operands_new: dict[str, blosc2.NDArray | blosc2.LazyExpr],
-) -> tuple(str, dict[str, blosc2.NDArray]):
+) -> tuple[str, dict[str, blosc2.NDArray]]:
     """
     Given an expression in string form, return its operands.
 
@@ -738,8 +738,6 @@ def visit_Name(self, node):
                     node.id = newexpr.replace(";", "")
                 else:
                     node.id = self.update_func(localop)
-            else:
-                pass
             self.generic_visit(node)
 
         def visit_Call(self, node):
@@ -784,7 +782,7 @@ def convert_to_slice(expression):
             slicer = str(slicer)
             # use slice so that lazyexpr uses blosc arrays internally
             # (and doesn't decompress according to getitem syntax)
-            new_expr += ".slice(" + slicer + ")"
+            new_expr += f".slice({slicer})"
             skip_to_char = i + k + 1
         else:
             new_expr += expr_i
@@ -833,11 +831,11 @@ def extract_numpy_scalars(expr: str):
 
 def validate_inputs(inputs: dict, out=None, reduce=False) -> tuple:  # noqa: C901
     """Validate the inputs for the expression."""
-    if len(inputs) == 0:
+    if not inputs:
         if out is None:
             raise ValueError(
                 "You really want to pass at least one input or one output for building a LazyArray."
-                "  Maybe you want blosc2.empty() instead?"
+                " Maybe you want blosc2.empty() instead?"
             )
         if isinstance(out, blosc2.NDArray):
             return out.shape, out.chunks, out.blocks, True
@@ -854,7 +852,7 @@ def validate_inputs(inputs: dict, out=None, reduce=False) -> tuple:  # noqa: C90
 
     # More checks specific of NDArray inputs
     NDinputs = [input for input in inputs if hasattr(input, "chunks")]
-    if len(NDinputs) == 0:
+    if not NDinputs:
         # All inputs are NumPy arrays, so we cannot take the fast path
         if inputs and hasattr(inputs[0], "shape"):
             shape = inputs[0].shape
@@ -895,7 +893,7 @@ def is_full_slice(item):
     elif isinstance(item, int | bool):
         return False
     else:
-        return item == slice(None, None, None) or item == Ellipsis
+        return item in (slice(None, None, None), Ellipsis)
 
 
 def do_slices_intersect(slice1: list | tuple, slice2: list | tuple) -> bool:
@@ -1925,7 +1923,7 @@ def fuse_expressions(expr, new_base, dup_op):
         if i < skip_to_char:
             continue
         if expr_i == "o":
-            if i > 0 and (expr[i - 1] != " " and expr[i - 1] != "("):
+            if i > 0 and expr[i - 1] not in {" ", "("}:
                 # Not a variable
                 new_expr += expr_i
                 continue
@@ -2960,18 +2958,18 @@ def info(self):
 
     @property
     def info_items(self):
-        items = []
-        items += [("type", f"{self.__class__.__name__}")]
         inputs = {}
         for key, value in self.inputs_dict.items():
             if isinstance(value, np.ndarray | blosc2.NDArray | blosc2.C2Array):
                 inputs[key] = f"<{value.__class__.__name__}> {value.shape} {value.dtype}"
             else:
                 inputs[key] = str(value)
-        items += [("inputs", inputs)]
-        items += [("shape", self.shape)]
-        items += [("dtype", self.dtype)]
-        return items
+        return [
+            ("type", f"{self.__class__.__name__}"),
+            ("inputs", inputs),
+            ("shape", self.shape),
+            ("dtype", self.dtype),
+        ]
 
     # TODO: indices and sort are repeated in LazyExpr; refactor
     def indices(self, order: str | list[str] | None = None) -> blosc2.LazyArray:

src/blosc2/ndarray.py

@@ -3717,8 +3717,8 @@ def _check_ndarray_kwargs(**kwargs):  # noqa: C901
     else:
         # Add the default storage values as long as they are not already passed
         storage_dflts = asdict(blosc2.Storage(urlpath=kwargs.get("urlpath")))  # urlpath can affect defaults
-        not_passed = {k: v for k, v in storage_dflts.items() if k not in kwargs}
-        kwargs = {**kwargs, **not_passed}
+        # If a key appears in both operands, the one from the right-hand operand wins
+        kwargs = storage_dflts | kwargs
 
     supported_keys = [
         "chunks",

src/blosc2/proxy.py

@@ -731,15 +731,11 @@ def apply(cls, data, func, args, kwargs, decorator, axis):
             return func(data, *args, **kwargs)
         elif axis in (0, "index"):
             # pandas apply(axis=0) column-wise
-            result = []
-            for row_idx in range(data.shape[1]):
-                result.append(func(data[:, row_idx], *args, **kwargs))
+            result = [func(data[:, row_idx], *args, **kwargs) for row_idx in range(data.shape[1])]
             return np.vstack(result).transpose()
         elif axis in (1, "columns"):
             # pandas apply(axis=1) row-wise
-            result = []
-            for col_idx in range(data.shape[0]):
-                result.append(func(data[col_idx, :], *args, **kwargs))
+            result = [func(data[col_idx, :], *args, **kwargs) for col_idx in range(data.shape[0])]
             return np.vstack(result)
         else:
             raise NotImplementedError(f"Unknown axis '{axis}'. Use one of 0, 1 or None.")

src/blosc2/schunk.py

@@ -68,8 +68,7 @@ def __len__(self):
         return super().nvlmetalayers()
 
     def __iter__(self):
-        keys = super().get_names()
-        yield from keys
+        yield from super().get_names()
 
     def getall(self):
         """

tests/ndarray/test_lossy.py

@@ -75,11 +75,10 @@ def test_lossy(shape, cparams, dtype, urlpath, contiguous):
         or a.schunk.cparams.filters[0] == blosc2.Filter.NDMEAN
     ):
         _ = a[...]
-    else:
+    elif dtype in (np.float32, np.float64):
         tol = 1e-5
-        if dtype in (np.float32, np.float64):
-            np.testing.assert_allclose(a[...], array, rtol=tol, atol=tol)
-        else:
-            np.array_equal(a[...], array)
+        np.testing.assert_allclose(a[...], array, rtol=tol, atol=tol)
+    else:
+        np.array_equal(a[...], array)
 
     blosc2.remove_urlpath(urlpath)

tests/test_schunk_constructor.py

@@ -158,7 +158,7 @@ def test_schunk_fill_special(contiguous, urlpath, cparams, nitems, special_value
         if isinstance(expected_value, float):
             dtype = np.float32
         elif isinstance(expected_value, bytes):
-            dtype = np.dtype("|S" + str(len(expected_value)))
+            dtype = np.dtype(f"|S{len(expected_value)}")
         array = np.full(nitems, expected_value, dtype=dtype)
         dest = np.empty(nitems, dtype=dtype)
         schunk.get_slice(out=dest)