Skip to content

Commit 8731e88

Browse files
authored
Merge branch 'master' into use_device_index_in_neo
2 parents c201b74 + af7c53c commit 8731e88

File tree

5 files changed

+219
-191
lines changed

5 files changed

+219
-191
lines changed

.github/workflows/io-test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- uses: conda-incubator/setup-miniconda@v3
5050
with:
51-
activate-environment: neo-test-env
51+
activate-environment: neo-test-env-${{ matrix.python-version }}
5252
python-version: "${{ matrix.python-version }}"
5353

5454
- name: Get current dependencies hash
@@ -62,7 +62,7 @@ jobs:
6262
# * when package dependencies change
6363
id: cache-conda-env
6464
with:
65-
path: /usr/share/miniconda/envs/neo-test-env
65+
path: /usr/share/miniconda/envs/neo-test-env-${{ matrix.python-version }}
6666
key: ${{ runner.os }}-conda-env-${{ steps.dependencies.outputs.hash }}-${{ steps.date.outputs.date }}
6767
# restore-keys match any key that starts with the restore-key
6868
restore-keys: |
@@ -74,8 +74,7 @@ jobs:
7474
# restore-key hits should result in `cache-hit` == 'false'
7575
if: steps.cache-conda-env.outputs.cache-hit != 'true'
7676
run: |
77-
conda env update --name neo-test-env --file environment_testing.yml --prune
78-
conda install python=${{ matrix.python-version }}
77+
conda env update --name neo-test-env-${{ matrix.python-version }} --file environment_testing.yml --prune
7978
8079
- name: Configure git
8180
run: |

neo/io/nwbio.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ def _write_block(self, block):
495495
if segment.block is not block:
496496
raise TypeError(f"segment.block must be block it is {segment.block}")
497497
if not segment.name:
498-
segment.name = f"{block.name} : segment{i}"
498+
segment.name = f"{block.name} segment{i}"
499499
self._write_segment(self._nwbfile, segment, electrodes)
500500
self.blocks_written += 1
501501

@@ -529,14 +529,14 @@ def _write_segment(self, nwbfile, segment, electrodes):
529529
signal.name = f"{segment.name} {signal.name} {i}"
530530
logging.warning(f"Warning signal name exists. New name: {signal.name}")
531531
else:
532-
signal.name = f"{segment.name} : analogsignal{signal.name} {i}"
532+
signal.name = f"{segment.name} analogsignal{signal.name} {i}"
533533
self._write_signal(self._nwbfile, signal, electrodes)
534534

535535
for i, train in enumerate(segment.spiketrains):
536536
if train.segment is not segment:
537537
raise TypeError(f"train.segment must be segment and is {train.segment}")
538538
if not train.name:
539-
train.name = f"{segment.name} : spiketrain{i}"
539+
train.name = f"{segment.name} spiketrain{i}"
540540
self._write_spiketrain(self._nwbfile, train)
541541

542542
for i, event in enumerate(segment.events):
@@ -546,12 +546,12 @@ def _write_segment(self, nwbfile, segment, electrodes):
546546
event.name = f"{segment.name} {event.name} {i}"
547547
logging.warning(f"Warning event name exists. New name: {event.name}")
548548
else:
549-
event.name = f"{segment.name} : event{event.name} {i}"
549+
event.name = f"{segment.name} event{event.name} {i}"
550550
self._write_event(self._nwbfile, event)
551551

552552
for i, epoch in enumerate(segment.epochs):
553553
if not epoch.name:
554-
epoch.name = f"{segment.name} : epoch{i}"
554+
epoch.name = f"{segment.name} epoch{i}"
555555
self._write_epoch(self._nwbfile, epoch)
556556

557557
def _write_signal(self, nwbfile, signal, electrodes):

0 commit comments

Comments
 (0)