Skip to content

Commit b6cfaf6

Browse files
authored
Merge pull request #18 from dj-sciops/main
Pull from `main`
2 parents a9c4559 + c4fafcd commit b6cfaf6

17 files changed

Lines changed: 660 additions & 441 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
FROM python:3.9-slim@sha256:5f0192a4f58a6ce99f732fe05e3b3d00f12ae62e183886bca3ebe3d202686c7f
1+
ARG PY_VER=3.11
2+
ARG DISTRO=bullseye
3+
FROM mcr.microsoft.com/devcontainers/python:${PY_VER}-${DISTRO}
24

3-
ENV PATH /usr/local/bin:$PATH
4-
ENV PYTHON_VERSION 3.9.17
5+
# Avoid warnings by switching to noninteractive
6+
ENV DEBIAN_FRONTEND=noninteractive
7+
8+
USER root
59

610
RUN \
7-
adduser --system --disabled-password --shell /bin/bash vscode && \
811
# install docker
912
apt-get update && \
1013
apt-get install ca-certificates curl gnupg lsb-release -y && \
@@ -45,4 +48,5 @@ ENV EPHYS_ROOT_DATA_DIR /workspaces/element-array-ephys/example_data
4548
ENV DATABASE_PREFIX neuro_
4649

4750
USER vscode
48-
CMD bash -c "sudo rm /var/run/docker.pid; sudo dockerd"
51+
52+
CMD bash -c "sudo rm /var/run/docker.pid; sudo dockerd"

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
},
2323
"vscode": {
2424
"extensions": [
25-
"ms-python.python@2023.8.0",
26-
"ms-toolsai.jupyter@2023.3.1201040234"
25+
"ms-python.python@2025.6.1",
26+
"ms-toolsai.jupyter@2025.4.1"
2727
]
2828
}
2929
}

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: DataJoint Contribution Guideline
4-
url: https://docs.datajoint.org/python/community/02-Contribute.html
4+
url: https://docs.datajoint.com/about/contribute/
55
about: Please make sure to review the DataJoint Contribution Guidelines

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
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.4.5] - 2025-09-17
7+
8+
+ Fix - Rename `env.yml` to `conda_env.yml` for consistency with other projects
9+
+ Update - Passing tests by blackifying previous updates
10+
11+
## [0.4.4] - 2025-06-06
12+
13+
+ Update - Update params in test/tutorial
14+
+ Fix - Moved KiloSort's template_features to additional_files
15+
16+
## [0.4.3] - 2025-06-03
17+
18+
+ Update - Use `Spikeinterface` official released versions (instead of install directly from source)
19+
620
## [0.4.2] - 2025-03-25
721

822
+ Fix - Add key_source to `ProbeLevelReport` to filter for 'good' quality units

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Contribution Guidelines
22

33
This project follows the
4-
[DataJoint Contribution Guidelines](https://datajoint.com/docs/about/contribute/).
4+
[DataJoint Contribution Guidelines](https://docs.datajoint.com/about/contribute/).
55
Please reference the link for more full details.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ environment and notebooks to learn the pipeline.
4444
+ [Interactive tutorial on GitHub
4545
Codespaces](https://github.com/datajoint/element-array-ephys#interactive-tutorial)
4646

47-
+ [Documentation](https://datajoint.com/docs/elements/element-array-ephys)
47+
+ [Documentation](https://docs.datajoint.com/elements/element-array-ephys/)
4848

4949
## Support
5050

File renamed without changes.

docs/mkdocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--- # ---------------------- PROJECT SPECIFIC ---------------------------
22

33
site_name: DataJoint Documentation
4-
site_url: http://localhost/docs/elements/element-array-ephys
4+
site_url: https://docs.datajoint.com/elements/element-array-ephys/
55
repo_url: https://github.com/datajoint/element-array-ephys
66
repo_name: datajoint/element-array-ephys
77
nav:

docs/src/.overrides/partials/nav.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
{% endif %}
88
<nav class="{{ class }}" aria-label="{{ lang.t('nav.title') }}" data-md-level="0">
99
<label class="md-nav__title" for="__drawer">
10-
<a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}"
11-
title="{{ config.site_name | e }}" class="md-nav__button md-logo"
12-
aria-label="{{ config.site_name }}" data-md-component="logo">
10+
<a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}"
11+
class="md-nav__button md-logo" aria-label="{{ config.site_name }}" data-md-component="logo">
1312
{% include "partials/logo.html" %}
1413
</a>
1514
{#-
1615
Add DataJoint home link to navigation header, otherwise unchanged
1716
-#}
18-
<a href="https://datajoint.com/docs/elements/" title="DataJoint Elements">
17+
<a href="https://docs.datajoint.com/elements/" title="DataJoint Elements">
1918
⬅ Home
2019
</a>
2120
</label>

docs/src/concepts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ is a table within the Element or a table connected to the Element.
103103

104104
![diagram](https://raw.githubusercontent.com/datajoint/element-array-ephys/main/images/attached_array_ephys_element_acute.svg)
105105

106-
### `subject` schema ([API docs](https://datajoint.com/docs/elements/element-animal/api/element_animal/subject))
106+
### `subject` schema ([API docs](https://docs.datajoint.com/elements/element-animal/0.1/api/element_animal/subject/))
107107

108108
Although not required, most choose to connect the `Session` table to a `Subject` table.
109109

110110
| Table | Description |
111111
| --- | --- |
112112
| Subject | A table containing basic information of the research subject. |
113113

114-
### `session` schema ([API docs](https://datajoint.com/docs/elements/element-session/api/element_session/session_with_datetime))
114+
### `session` schema ([API docs](https://docs.datajoint.com/elements/element-session/))
115115

116116
| Table | Description |
117117
| --- | --- |

0 commit comments

Comments
 (0)