Skip to content

Commit 41e4d6d

Browse files
kushalbakshikushalbakshi
authored
Merge branch 'datajoint:main' into main
2 parents fd5e9fa + 9299142 commit 41e4d6d

File tree

16 files changed

+697
-459
lines changed

16 files changed

+697
-459
lines changed

‎.github/workflows/release.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@ on:
44
jobs:
55
make_github_release:
66
uses: datajoint/.github/.github/workflows/make_github_release.yaml@main
7-
pypi_release:
8-
needs: make_github_release
9-
uses: datajoint/.github/.github/workflows/pypi_release.yaml@main
10-
secrets:
11-
TWINE_USERNAME: ${{secrets.TWINE_USERNAME}}
12-
TWINE_PASSWORD: ${{secrets.TWINE_PASSWORD}}
13-
with:
14-
UPLOAD_URL: ${{needs.make_github_release.outputs.release_upload_url}}
157
mkdocs_release:
168
uses: datajoint/.github/.github/workflows/mkdocs_release.yaml@main
179
permissions:

‎CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,24 @@
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+
12+
## [0.3.3] - 2024-01-24
13+
+ Update - remove PyPi release from `release.yml` since it will fail after the new `setup.py`
14+
15+
## [0.3.2] - 2024-01-12
16+
+ Fix - `probe_geometry` bugfix for incorrect handling of probes with staggered electrode positions
17+
18+
## [0.3.1] - 2023-11-28
19+
+ Update - Flowchart borders for consistency with other DataJoint Elements
20+
+ Fix - `dj.config()` setup moved to `tutorial_pipeline.py` instead of `__init__.py`
21+
+ Update - Elements installed directly from GitHub instead of PyPI
22+
+ Update - Structure of the tutorial notebook
23+
624
## [0.3.0] - 2023-10-25
725

826
+ Add - DevContainer for codespaces

‎docs/src/.overrides/assets/stylesheets/extra.css

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,6 @@ html a[title="YouTube"].md-social__link svg {
9292
/* --md-footer-fg-color: var(--dj-white); */
9393
}
9494

95-
table {
96-
border-collapse: collapse;
97-
}
98-
99-
tr {
100-
border-left: 1px solid var(--dj-black);
101-
border-right: 1px solid var(--dj-black);
102-
}
103-
104-
td, th {
105-
border-top: 1px solid var(--dj-black);
106-
border-bottom: 1px solid var(--dj-black);
107-
}
108-
109-
[data-md-color-scheme="slate"] td, th {
110-
background-color: var(--dj-white);
95+
[data-md-color-scheme="slate"] .jupyter-wrapper .Table Td {
11196
color: var(--dj-black);
11297
}

‎element_array_ephys/ephys_acute.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,9 +1049,11 @@ def make(self, key):
10491049
spike_time_key = (
10501050
"spike_times_sec_adj"
10511051
if "spike_times_sec_adj" in kilosort_dataset.data
1052-
else "spike_times_sec"
1053-
if "spike_times_sec" in kilosort_dataset.data
1054-
else "spike_times"
1052+
else (
1053+
"spike_times_sec"
1054+
if "spike_times_sec" in kilosort_dataset.data
1055+
else "spike_times"
1056+
)
10551057
)
10561058
spike_times = kilosort_dataset.data[spike_time_key]
10571059
kilosort_dataset.extract_spike_depths()
@@ -1086,11 +1088,13 @@ def make(self, key):
10861088
"spike_sites": spike_sites[
10871089
kilosort_dataset.data["spike_clusters"] == unit
10881090
],
1089-
"spike_depths": spike_depths[
1090-
kilosort_dataset.data["spike_clusters"] == unit
1091-
]
1092-
if spike_depths is not None
1093-
else None,
1091+
"spike_depths": (
1092+
spike_depths[
1093+
kilosort_dataset.data["spike_clusters"] == unit
1094+
]
1095+
if spike_depths is not None
1096+
else None
1097+
),
10941098
}
10951099
)
10961100

‎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/readers/probe_geometry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def build_electrode_layouts(
188188
row_offset = np.zeros_like(x_coords)
189189
else:
190190
assert len(row_offset) == row_count
191-
row_offset = np.tile(row_offset, col_count_per_shank)
191+
row_offset = np.repeat(row_offset, col_count_per_shank)
192192
x_coords = x_coords + row_offset
193193

194194
shank_cols = np.tile(range(col_count_per_shank), row_count)

0 commit comments

Comments
 (0)