Skip to content

Commit 60fd23f

Browse files
committed
Merge branch 'master' of https://github.com/NeuralEnsemble/python-neo into extend_OE_npix
2 parents 51a167c + d47de11 commit 60fd23f

File tree

7 files changed

+75
-53
lines changed

7 files changed

+75
-53
lines changed

.github/workflows/core-test.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: NeoCoreTest
2+
3+
on:
4+
pull_request:
5+
branches: [master]
6+
types: [synchronize, opened, reopened, ready_for_review]
7+
8+
# run checks on any change of master, including merge of PRs
9+
push:
10+
branches: [master]
11+
12+
13+
14+
jobs:
15+
multi-os-python-numpy:
16+
runs-on: ${{ matrix.os }}
17+
18+
strategy:
19+
fail-fast: true
20+
matrix:
21+
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
22+
python-version: ['3.7', '3.8', '3.9']
23+
numpy-version: ['1.16.6', '1.19.5', '1.20.3', '1.21.5', '1.22.3']
24+
exclude:
25+
- python-version: '3.7'
26+
numpy-version: '1.22.3'
27+
28+
steps:
29+
- name: Set up Python ${{ matrix.python-version }}
30+
uses: actions/setup-python@v2
31+
with:
32+
python-version: ${{ matrix.python-version }}
33+
34+
- name: Checkout repository
35+
uses: actions/checkout@v2
36+
37+
- name: Install numpy ${{ matrix.numpy-version }}
38+
run: |
39+
python -m pip install --upgrade pip
40+
pip install numpy==${{ matrix.numpy-version }}
41+
pip install pytest pytest-cov
42+
pip install .
43+
44+
- name: List pip packages
45+
run: |
46+
pip -V
47+
pip list
48+
49+
- name: Run tests
50+
run: |
51+
pytest --cov=neo neo/test/coretest

.github/workflows/full-test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: neo.io and neo.rawio tests
1+
name: NeoIoTest
22

33
on:
44
pull_request:
@@ -9,12 +9,13 @@ on:
99
push:
1010
branches: [master]
1111

12+
1213
jobs:
1314
build-and-test:
1415
name: Test on (${{ matrix.os }})
1516
runs-on: ${{ matrix.os }}
1617
strategy:
17-
fail-fast: false
18+
fail-fast: true
1819
matrix:
1920
# "macos-latest", "windows-latest"
2021
os: ["ubuntu-latest", ]

.readthedocs.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ sphinx:
99
configuration: doc/source/conf.py
1010

1111
python:
12-
install:
13-
- requirements: doc/requirements_docs.txt
12+
install:
13+
- method: pip
14+
path: .
15+
- requirements: doc/requirements_docs.txt

.travis.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

doc/source/releases/0.10.2.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
========================
2+
Neo 0.10.2 release notes
3+
========================
4+
5+
8th March 2022
6+
7+
This release fixes the following bugs introduced in 0.10.1:
8+
9+
1. Remove broken imports in `spike2rawio.py <https://github.com/NeuralEnsemble/python-neo/issues/1089>`_
10+
2. Fix the compilation of the documentation on `readthedoc <https://github.com/NeuralEnsemble/python-neo/issues/1084>`_

doc/source/whatisnew.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Release notes
66
.. toctree::
77
:maxdepth: 1
88

9+
releases/0.10.2.rst
910
releases/0.10.1.rst
1011
releases/0.10.0.rst
1112
releases/0.9.0.rst

neo/rawio/openephysrawio.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,12 @@ def _parse_header(self):
120120

121121
if seg_index == 0:
122122
# add in channel list
123+
if ch_name[:2].upper() == 'CH':
124+
units = 'uV'
125+
else:
126+
units = 'V'
123127
signal_channels.append((ch_name, chan_id, chan_info['sampleRate'],
124-
'int16', 'V', chan_info['bitVolts'], 0., processor_id))
128+
'int16', units, chan_info['bitVolts'], 0., processor_id))
125129

126130
# In some cases, continuous do not have the same lentgh because
127131
# one record block is missing when the "OE GUI is freezing"
@@ -173,7 +177,7 @@ def _parse_header(self):
173177

174178
# and create streams channels (keep natural order 'CH' first)
175179
stream_ids, order = np.unique(chan_stream_ids, return_index=True)
176-
stream_ids = stream_ids[order]
180+
stream_ids = stream_ids[np.argsort(order)]
177181
signal_streams = [(f'Signals {stream_id}', f'{stream_id}') for stream_id in stream_ids]
178182
signal_streams = np.array(signal_streams, dtype=_signal_stream_dtype)
179183

0 commit comments

Comments
 (0)