Merge branch 'NeuralEnsemble:master' into typing

Author: zm711

.readthedocs.yaml

@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   tools:
-    python: "3.8"
+    python: "3.11"
 
 sphinx:
    configuration: doc/source/conf.py
@@ -14,4 +14,3 @@ python:
       path: .
       extra_requirements:
         - docs
-

neo/core/analogsignal.py

@@ -417,7 +417,7 @@ def _repr_pretty_(self, pp, cycle):
         Handle pretty-printing the :class:`AnalogSignal`.
         '''
         pp.text(f"{self.__class__.__name__} with {self.shape[1]} channels of length "
-                f"{self.shape[0]}; units {self.units.dimesionality.string}; datatype "
+                f"{self.shape[0]}; units {self.units.dimensionality.string}; datatype "
                 f"{self.dtype}")
         if self._has_repr_pretty_attrs_():
             pp.breakable()

neo/rawio/blackrockrawio.py

@@ -61,6 +61,7 @@
 import os
 import re
 import warnings
+import math
 
 import numpy as np
 import quantities as pq
@@ -646,7 +647,7 @@ def _get_timestamp_slice(self, timestamp, seg_index, t_start, t_stop):
         if t_start is None:
             ind_start = None
         else:
-            ts = np.math.ceil(t_start * self.__nev_basic_header['timestamp_resolution'])
+            ts = math.ceil(t_start * self.__nev_basic_header['timestamp_resolution'])
             ind_start = np.searchsorted(timestamp, ts)
 
         if t_stop is None:

neo/rawio/plexon2rawio/plexon2rawio.py

@@ -23,6 +23,8 @@
 """
 import pathlib
 import warnings
+import platform
+
 from collections import namedtuple
 from urllib.request import urlopen
 from datetime import datetime
@@ -74,14 +76,19 @@ def __init__(self, filename, pl2_dll_file_path=None):
 
         # download default PL2 dll once if not yet available
         if pl2_dll_file_path is None:
-            pl2_dll_folder = pathlib.Path .home() / '.plexon_dlls_for_neo'
+            architecture = platform.architecture()[0]
+            if architecture == '64bit' and platform.system() == 'Windows':
+                file_name = "PL2FileReader64.dll"
+            else:  # Apparently wine uses the 32 bit version in linux
+                file_name = "PL2FileReader.dll"
+            pl2_dll_folder = pathlib.Path.home() / '.plexon_dlls_for_neo'
             pl2_dll_folder.mkdir(exist_ok=True)
-            pl2_dll_file_path = pl2_dll_folder / 'PL2FileReader.dll'
+            pl2_dll_file_path = pl2_dll_folder / file_name
+
+            if not pl2_dll_file_path.exists():
+                url = f'https://raw.githubusercontent.com/Neuralensemble/pypl2/master/bin/{file_name}'
+                dist = urlopen(url=url)
 
-            if pl2_dll_file_path.exists():
-                warnings.warn(f'Using cached plexon dll at {pl2_dll_file_path}')
-            else:
-                dist = urlopen('https://raw.githubusercontent.com/Neuralensemble/pypl2/master/bin/PL2FileReader.dll')
                 with open(pl2_dll_file_path, 'wb') as f:
                     print(f'Downloading plexon dll to {pl2_dll_file_path}')
                     f.write(dist.read())
@@ -288,7 +295,7 @@ def _get_signal_size(self, block_index, seg_index, stream_index):
         stream_id = self.header['signal_streams'][stream_index]['id']
         stream_characteristic = list(self.signal_stream_characteristics.values())[stream_index]
         assert stream_id == stream_characteristic.id
-        return stream_characteristic.n_samples
+        return int(stream_characteristic.n_samples)  # Avoids returning a numpy.int64 scalar
 
     def _get_signal_t_start(self, block_index, seg_index, stream_index):
         # This returns the t_start of signals as a float value in seconds

pyproject.toml

@@ -70,7 +70,8 @@ test = [
 ]
 
 docs = [
-    "docutils<0.18",
+    "docutils",
+    "sphinx",
     "sphinx-inline-tabs",
     "sphinx-gallery",
     "pydata-sphinx-theme",