Fix linting issues in util.py and test_util.py (ruff format)

Author: Yashsingh045

malariagen_data/util.py

@@ -1524,12 +1524,10 @@ def _apply_allele_mapping(x, mapping, max_allele):
 
 def _dask_apply_allele_mapping(v, mapping, max_allele):
     if not isinstance(v, da.Array):
-        raise TypeError(
-            f"Expected v to be a dask.array.Array, " f"got {type(v).__name__}"
-        )
+        raise TypeError(f"Expected v to be a dask.array.Array, got {type(v).__name__}")
     if not isinstance(mapping, np.ndarray):
         raise TypeError(
-            f"Expected mapping to be a numpy.ndarray, " f"got {type(mapping).__name__}"
+            f"Expected mapping to be a numpy.ndarray, got {type(mapping).__name__}"
         )
     assert v.ndim == 2
     assert mapping.ndim == 2
@@ -1551,12 +1549,10 @@ def _genotype_array_map_alleles(gt, mapping):
     # N.B., scikit-allel does not handle empty blocks well, so we
     # include some extra logic to handle that better.
     if not isinstance(gt, np.ndarray):
-        raise TypeError(
-            f"Expected gt to be a numpy.ndarray, " f"got {type(gt).__name__}"
-        )
+        raise TypeError(f"Expected gt to be a numpy.ndarray, got {type(gt).__name__}")
     if not isinstance(mapping, np.ndarray):
         raise TypeError(
-            f"Expected mapping to be a numpy.ndarray, " f"got {type(mapping).__name__}"
+            f"Expected mapping to be a numpy.ndarray, got {type(mapping).__name__}"
         )
     assert gt.ndim == 3
     assert mapping.ndim == 3
@@ -1578,11 +1574,11 @@ def _genotype_array_map_alleles(gt, mapping):
 def _dask_genotype_array_map_alleles(gt, mapping):
     if not isinstance(gt, da.Array):
         raise TypeError(
-            f"Expected gt to be a dask.array.Array, " f"got {type(gt).__name__}"
+            f"Expected gt to be a dask.array.Array, got {type(gt).__name__}"
         )
     if not isinstance(mapping, np.ndarray):
         raise TypeError(
-            f"Expected mapping to be a numpy.ndarray, " f"got {type(mapping).__name__}"
+            f"Expected mapping to be a numpy.ndarray, got {type(mapping).__name__}"
         )
     assert gt.ndim == 3
     assert mapping.ndim == 2

tests/test_util.py

@@ -1,33 +1,15 @@
 """Tests for Region.__repr__ and CacheMiss.__repr__ / default message."""
-import importlib.util as ilu
-import sys
 
-# Load malariagen_data/util.py directly, bypassing the package __init__.py
-# which has heavy transitive imports (bokeh, plotly, etc.).
-_spec = ilu.spec_from_file_location(
-    "malariagen_data.util",
-    "malariagen_data/util.py",
-)
-_util = ilu.module_from_spec(_spec)
-sys.modules["malariagen_data.util"] = _util
+import pytest
 
-try:
-    _spec.loader.exec_module(_util)
-except Exception:
-    # If util.py itself can't be loaded (missing deps), fall back to a
-    # normal import so the tests still work in a fully-installed env.
-    import malariagen_data.util as _util  # type: ignore[assignment]
-
-Region = _util.Region
-CacheMiss = _util.CacheMiss
-
-import pytest  # noqa: E402
+from malariagen_data.util import CacheMiss, Region
 
 
 # ---------------------------------------------------------------------------
 # Region
 # ---------------------------------------------------------------------------
 
+
 def test_region_repr_contig_only():
     r = Region("2L")
     assert repr(r) == "Region('2L', None, None)"
@@ -55,6 +37,7 @@ def test_region_repr_start_only():
 # CacheMiss
 # ---------------------------------------------------------------------------
 
+
 def test_cache_miss_no_key():
     cm = CacheMiss()
     assert repr(cm) == "CacheMiss()"