Skip to content

Commit 925f944

Browse files
authored
Merge branch 'dev' into dep-py39
2 parents 0dc429c + a0c2fc6 commit 925f944

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ breaking down the barriers to data sharing in neuroscience.
3838
3939
// Load iframe content only when first opened
4040
if (isShowing && !iframeLoaded) {
41-
iframe.src = 'https://magland.github.io/nwb-assistant/chat';
41+
iframe.src = 'https://nwb-assistant.neurosift.app/';
4242
iframeLoaded = true;
4343
}
4444
});

environment-ros3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ channels:
66
dependencies:
77
- python==3.13
88
- h5py==3.12.1
9-
- hdmf==4.1.0
9+
- hdmf==4.1.2
1010
- matplotlib==3.9.2
1111
- numpy==2.1.3
1212
- pandas==2.2.3

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ classifiers = [
3333
]
3434
dependencies = [
3535
"h5py>=3.6.0",
36-
"hdmf>=4.1.1,<5",
36+
"hdmf>=4.1.2,<5",
3737
"numpy>=1.24.0",
3838
"pandas>=1.3.5",
3939
"python-dateutil>=2.8.2",

requirements-min.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# minimum versions of package dependencies for installing PyNWB
22
h5py==3.6.0
3-
hdmf==4.1.1
3+
hdmf==4.1.2
44
numpy==1.24.0
55
pandas==1.3.5
66
python-dateutil==2.8.2

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pinned dependencies to reproduce an entire development environment to use PyNWB
22
h5py==3.12.1
3-
hdmf==4.1.1
3+
hdmf==4.1.2
44
numpy==2.1.1
55
pandas==2.2.3
66
python-dateutil==2.9.0.post0

tests/unit/test_ecephys.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,11 @@ def test_link(self):
8686

8787
def test_invalid_data_shape(self):
8888
table, region = self._create_table_and_region()
89-
with self.assertRaisesWith(ValueError, ("ElectricalSeries.__init__: incorrect shape for 'data' (got '(2, 2, 2, "
90-
"2)', expected '((None,), (None, None), (None, None, None))')")):
89+
msg = (
90+
"ElectricalSeries.__init__: incorrect shape for data: got (2, 2, 2, 2), "
91+
"and expected (*,) or (*, *) or (*, *, *)"
92+
)
93+
with self.assertRaisesWith(ValueError, msg):
9194
ElectricalSeries(name='test_ts1', data=np.ones((2, 2, 2, 2)), electrodes=region,
9295
timestamps=[0.0, 0.1, 0.2, 0.3, 0.4, 0.5])
9396

0 commit comments

Comments
 (0)