Skip to content

Commit 9299142

Browse files
kushalbakshikushalbakshi
authored
Merge pull request #185 from datajoint/pytest
Add pytest
2 parents cc36465 + 333f411 commit 9299142

File tree

13 files changed

+683
-434
lines changed

13 files changed

+683
-434
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
44
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
55

6+
## [0.3.4] - 2024-03-22
7+
8+
+ Add - pytest
9+
+ Update - Ephys schema changed from `ephys_acute` to `ephys_no_curation` in `tutorial.ipynb`
10+
11+
612
## [0.3.3] - 2024-01-24
713
+ Update - remove PyPi release from `release.yml` since it will fail after the new `setup.py`
814

‎element_array_ephys/ephys_acute.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,9 +1044,11 @@ def make(self, key):
10441044
spike_time_key = (
10451045
"spike_times_sec_adj"
10461046
if "spike_times_sec_adj" in kilosort_dataset.data
1047-
else "spike_times_sec"
1048-
if "spike_times_sec" in kilosort_dataset.data
1049-
else "spike_times"
1047+
else (
1048+
"spike_times_sec"
1049+
if "spike_times_sec" in kilosort_dataset.data
1050+
else "spike_times"
1051+
)
10501052
)
10511053
spike_times = kilosort_dataset.data[spike_time_key]
10521054
kilosort_dataset.extract_spike_depths()
@@ -1081,11 +1083,13 @@ def make(self, key):
10811083
"spike_sites": spike_sites[
10821084
kilosort_dataset.data["spike_clusters"] == unit
10831085
],
1084-
"spike_depths": spike_depths[
1085-
kilosort_dataset.data["spike_clusters"] == unit
1086-
]
1087-
if spike_depths is not None
1088-
else None,
1086+
"spike_depths": (
1087+
spike_depths[
1088+
kilosort_dataset.data["spike_clusters"] == unit
1089+
]
1090+
if spike_depths is not None
1091+
else None
1092+
),
10891093
}
10901094
)
10911095

‎element_array_ephys/ephys_chronic.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -973,9 +973,11 @@ def make(self, key):
973973
spike_time_key = (
974974
"spike_times_sec_adj"
975975
if "spike_times_sec_adj" in kilosort_dataset.data
976-
else "spike_times_sec"
977-
if "spike_times_sec" in kilosort_dataset.data
978-
else "spike_times"
976+
else (
977+
"spike_times_sec"
978+
if "spike_times_sec" in kilosort_dataset.data
979+
else "spike_times"
980+
)
979981
)
980982
spike_times = kilosort_dataset.data[spike_time_key]
981983
kilosort_dataset.extract_spike_depths()
@@ -1010,11 +1012,13 @@ def make(self, key):
10101012
"spike_sites": spike_sites[
10111013
kilosort_dataset.data["spike_clusters"] == unit
10121014
],
1013-
"spike_depths": spike_depths[
1014-
kilosort_dataset.data["spike_clusters"] == unit
1015-
]
1016-
if spike_depths is not None
1017-
else None,
1015+
"spike_depths": (
1016+
spike_depths[
1017+
kilosort_dataset.data["spike_clusters"] == unit
1018+
]
1019+
if spike_depths is not None
1020+
else None
1021+
),
10181022
}
10191023
)
10201024

‎element_array_ephys/ephys_no_curation.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -988,9 +988,11 @@ def make(self, key):
988988
spike_time_key = (
989989
"spike_times_sec_adj"
990990
if "spike_times_sec_adj" in kilosort_dataset.data
991-
else "spike_times_sec"
992-
if "spike_times_sec" in kilosort_dataset.data
993-
else "spike_times"
991+
else (
992+
"spike_times_sec"
993+
if "spike_times_sec" in kilosort_dataset.data
994+
else "spike_times"
995+
)
994996
)
995997
spike_times = kilosort_dataset.data[spike_time_key]
996998
kilosort_dataset.extract_spike_depths()

‎element_array_ephys/ephys_precluster.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -962,9 +962,11 @@ def make(self, key):
962962
spike_time_key = (
963963
"spike_times_sec_adj"
964964
if "spike_times_sec_adj" in kilosort_dataset.data
965-
else "spike_times_sec"
966-
if "spike_times_sec" in kilosort_dataset.data
967-
else "spike_times"
965+
else (
966+
"spike_times_sec"
967+
if "spike_times_sec" in kilosort_dataset.data
968+
else "spike_times"
969+
)
968970
)
969971
spike_times = kilosort_dataset.data[spike_time_key]
970972
kilosort_dataset.extract_spike_depths()
@@ -999,11 +1001,13 @@ def make(self, key):
9991001
"spike_sites": spike_sites[
10001002
kilosort_dataset.data["spike_clusters"] == unit
10011003
],
1002-
"spike_depths": spike_depths[
1003-
kilosort_dataset.data["spike_clusters"] == unit
1004-
]
1005-
if spike_depths is not None
1006-
else None,
1004+
"spike_depths": (
1005+
spike_depths[
1006+
kilosort_dataset.data["spike_clusters"] == unit
1007+
]
1008+
if spike_depths is not None
1009+
else None
1010+
),
10071011
}
10081012
)
10091013

‎element_array_ephys/ephys_report.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ def make(self, key):
7575
fig_prefix = (
7676
"-".join(
7777
[
78-
v.strftime("%Y%m%d%H%M%S")
79-
if isinstance(v, datetime.datetime)
80-
else str(v)
78+
(
79+
v.strftime("%Y%m%d%H%M%S")
80+
if isinstance(v, datetime.datetime)
81+
else str(v)
82+
)
8183
for v in key.values()
8284
]
8385
)

‎element_array_ephys/probe.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
Neuropixels Probes
33
"""
4+
45
import datajoint as dj
56

67
from .readers import probe_geometry

‎element_array_ephys/version.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
"""Package metadata."""
2-
__version__ = "0.3.3"
2+
3+
__version__ = "0.3.4"

0 commit comments

Comments
 (0)