Merge branch 'dev' into release-3.0.0

NeurodataWithoutBorders · Jan 28, 2025 · 81b0a49 · 81b0a49
2 parents 8ea9ca1 + c0ba7e1
commit 81b0a49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # PyNWB Changelog
 
-## PyNWB 3.0.0rc1 (January 7, 2025)
+## PyNWB 3.0.0rc1 (January 28, 2025)
 
 ### Breaking changes
 - The validation methods have been updated with multiple breaking changes. @stephprince [#1911](https://github.com/NeurodataWithoutBorders/pynwb/pull/1911)
@@ -44,6 +44,7 @@
   - Added the `--json-outpath-path` CLI argument to output validation results in a machine readable format.
 - Removed python 3.8 support, added python 3.13 support. @stephprince [#2007](https://github.com/NeurodataWithoutBorders/pynwb/pull/2007)
 - Added warnings when using positional arguments in `Container` constructor methods. Positional arguments will raise errors in the next major release. @stephprince [#1972](https://github.com/NeurodataWithoutBorders/pynwb/pull/1972)
+- `mock_ElectricalSeries`. Make number of electrodes between data and electrode region agree when explicitly passing data @h-mayorquin [#2019](https://github.com/NeurodataWithoutBorders/pynwb/pull/2019)
 
 ### Documentation and tutorial enhancements
 - Updated `SpikeEventSeries`, `DecompositionSeries`, and `FilteredEphys` examples. @stephprince [#2012](https://github.com/NeurodataWithoutBorders/pynwb/pull/2012)

diff --git a/src/pynwb/testing/mock/ecephys.py b/src/pynwb/testing/mock/ecephys.py
@@ -83,15 +83,16 @@ def mock_ElectricalSeries(
 
     # Set a default rate if timestamps are not provided
     rate = 30_000.0 if (timestamps is None and rate is None) else rate
+    n_electrodes = data.shape[1] if data is not None else 5
 
     electrical_series = ElectricalSeries(
         name=name or name_generator("ElectricalSeries"),
         description=description,
-        data=data if data is not None else np.ones((10, 5)),
+        data=data if data is not None else np.ones((10, n_electrodes)),
         rate=rate,
         starting_time=starting_time,
         timestamps=timestamps,
-        electrodes=electrodes or mock_electrodes(nwbfile=nwbfile),
+        electrodes=electrodes or mock_electrodes(nwbfile=nwbfile, n_electrodes=n_electrodes),
         filtering=filtering,
         conversion=conversion,
         offset=offset,