Merge branch 'master' into tiffio-fix

NeuralEnsemble · Jan 9, 2025 · 977ba7b · 977ba7b
2 parents 74c40b5 + af7c53c
commit 977ba7b
Show file tree

Hide file tree

Showing 6 changed files with 224 additions and 193 deletions.
diff --git a/.github/workflows/io-test.yml b/.github/workflows/io-test.yml
@@ -48,7 +48,7 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v3
         with:
-          activate-environment: neo-test-env
+          activate-environment: neo-test-env-${{ matrix.python-version }}
           python-version: "${{ matrix.python-version }}"
 
       - name: Get current dependencies hash
@@ -62,7 +62,7 @@ jobs:
         #   * when package dependencies change
         id: cache-conda-env
         with:
-          path: /usr/share/miniconda/envs/neo-test-env
+          path: /usr/share/miniconda/envs/neo-test-env-${{ matrix.python-version }}
           key: ${{ runner.os }}-conda-env-${{ steps.dependencies.outputs.hash }}-${{ steps.date.outputs.date }}
           # restore-keys match any key that starts with the restore-key
           restore-keys: |
@@ -74,8 +74,7 @@ jobs:
         # restore-key hits should result in `cache-hit` == 'false'
         if: steps.cache-conda-env.outputs.cache-hit != 'true'
         run: |
-          conda env update --name neo-test-env --file environment_testing.yml --prune
-          conda install python=${{ matrix.python-version }}
+          conda env update --name neo-test-env-${{ matrix.python-version }} --file environment_testing.yml --prune
 
       - name: Configure git
         run: |

diff --git a/neo/io/nwbio.py b/neo/io/nwbio.py
@@ -495,7 +495,7 @@ def _write_block(self, block):
             if segment.block is not block:
                 raise TypeError(f"segment.block must be block it is {segment.block}")
             if not segment.name:
-                segment.name = f"{block.name} : segment{i}"
+                segment.name = f"{block.name}  segment{i}"
             self._write_segment(self._nwbfile, segment, electrodes)
         self.blocks_written += 1
 
@@ -529,14 +529,14 @@ def _write_segment(self, nwbfile, segment, electrodes):
                 signal.name = f"{segment.name} {signal.name} {i}"
                 logging.warning(f"Warning signal name exists. New name: {signal.name}")
             else:
-                signal.name = f"{segment.name} : analogsignal{signal.name} {i}"
+                signal.name = f"{segment.name}  analogsignal{signal.name} {i}"
             self._write_signal(self._nwbfile, signal, electrodes)
 
         for i, train in enumerate(segment.spiketrains):
             if train.segment is not segment:
                 raise TypeError(f"train.segment must be segment and is {train.segment}")
             if not train.name:
-                train.name = f"{segment.name} : spiketrain{i}"
+                train.name = f"{segment.name}  spiketrain{i}"
             self._write_spiketrain(self._nwbfile, train)
 
         for i, event in enumerate(segment.events):
@@ -546,12 +546,12 @@ def _write_segment(self, nwbfile, segment, electrodes):
                 event.name = f"{segment.name}  {event.name} {i}"
                 logging.warning(f"Warning event name exists. New name: {event.name}")
             else:
-                event.name = f"{segment.name} : event{event.name} {i}"
+                event.name = f"{segment.name}  event{event.name} {i}"
             self._write_event(self._nwbfile, event)
 
         for i, epoch in enumerate(segment.epochs):
             if not epoch.name:
-                epoch.name = f"{segment.name} : epoch{i}"
+                epoch.name = f"{segment.name}  epoch{i}"
             self._write_epoch(self._nwbfile, epoch)
 
     def _write_signal(self, nwbfile, signal, electrodes):