Merge branch 'master' into fix_overflow_2.0

NeuralEnsemble · Dec 13, 2024 · c6b235d · c6b235d
2 parents 682bf76 + 9fd9ef1
commit c6b235d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/neo/rawio/plexonrawio.py b/neo/rawio/plexonrawio.py
@@ -213,7 +213,9 @@ def _parse_header(self):
                     np_scalar_to_python_scalar = lambda x: x.item() if isinstance(x, np.generic) else x
                     bl_header = {key: np_scalar_to_python_scalar(bl_header[key]) for key in bl_header.dtype.names}
 
-                    timestamp = bl_header["UpperByteOf5ByteTimestamp"] * 2**32 + bl_header["TimeStamp"]
+                    current_upper_byte_of_5_byte_timestamp = int(bl_header["UpperByteOf5ByteTimestamp"])
+                    current_bl_timestamp = int(bl_header["TimeStamp"])
+                    timestamp = current_upper_byte_of_5_byte_timestamp * 2**32 + current_bl_timestamp
                     n1 = bl_header["NumberOfWaveforms"]
                     n2 = bl_header["NumberOfWordsInWaveform"]
                     sample_count = n1 * n2

diff --git a/pyproject.toml b/pyproject.toml
@@ -80,7 +80,8 @@ docs = [
     "matplotlib",
     "nixio",
     "pynwb",
-    "igor2"
+    "igor2",
+    "numpy<2.0" # https://github.com/NeuralEnsemble/python-neo/pull/1612
 ]
 
 dev = [