Merge pull request #599 from MannLabs/fix_tests

fix a test failing on windows runners

Author: mschwoer

alphadia/fragcomp/utils.py

@@ -2,12 +2,9 @@
 
 import logging
 
-import numba as nb
 import numpy as np
 import pandas as pd
 
-from alphadia.utils import USE_NUMBA_CACHING
-
 logger = logging.getLogger(__name__)
 
 
@@ -48,11 +45,16 @@ def add_frag_start_stop_idx(
     return psm_df.merge(index_df, "inner", on="_candidate_idx")
 
 
-@nb.njit(cache=USE_NUMBA_CACHING)
-def candidate_hash(precursor_idx: int, rank: int) -> int:
-    """Create a 64 bit hash from the precursor_idx, and rank.
+def candidate_hash(precursor_idx: np.ndarray, rank: np.ndarray) -> np.ndarray:
+    """Create a 64 bit hash from the precursor_idx and rank.
 
     The precursor_idx is the lower 32 bits.
     The rank is the next 8 bits.
+
+    Returns
+    -------
+    np.ndarray (np.uint64)
+        A 64 bit hash of the precursor_idx and rank.
+
     """
-    return precursor_idx + (rank << 32)
+    return (precursor_idx + (rank << 32)).astype(np.uint64)

tests/unit_tests/test_fragcomp.py

@@ -93,7 +93,7 @@ def test_fragment_competition():
                 "mz_observed": np.array([100, 100, 200, 200]),
                 "proba": np.array([0.1, 0.2, 0.4, 0.6]),
                 "rank": np.array([0, 0, 0, 0], dtype=np.uint8),
-                "_candidate_idx": np.array([0, 1, 3, 5]),
+                "_candidate_idx": np.array([0, 1, 3, 5], dtype=np.uint64),
             }
         ),
     )