Skip to content

Commit 0e5295c

Browse files
ttngu207ttngu207
committed
Merge remote-tracking branch 'upstream/main'
2 parents a0df46b + 7dc76e8 commit 0e5295c

45 files changed

Lines changed: 2137 additions & 7531 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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

‎.github/workflows/devcontainer-build-publish-caller.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: devcontainer_build_publish
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
call_devcontainer_build_publish:
7+
uses: datajoint/.github/.github/workflows/devcontainer-build-publish.yaml@main
8+
secrets:
9+
DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
10+
DOCKERHUB_TOKEN: ${{secrets.DOCKERHUB_TOKEN_FOR_ELEMENTS}}

‎.github/workflows/mkdocs-release-caller.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: mkdocs-release
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
mkdocs_release:
7+
uses: datajoint/.github/.github/workflows/mkdocs_release.yaml@main
8+
permissions:
9+
contents: write

‎.github/workflows/semantic-release-caller.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: semantic-release
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
call_semantic_release:
7+
uses: datajoint/.github/.github/workflows/semantic-release.yaml@main
8+
secrets:
9+
APP_ID: ${{ secrets.ELEMENT_APP_ID }}
10+
GET_TOKEN_KEY: ${{ secrets.ELEMENT_GET_TOKEN_KEY }}

‎.github/workflows/test.yaml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
name: Test
22
on:
33
push:
4+
branches:
5+
- main
46
pull_request:
7+
branches:
8+
- main
59
workflow_dispatch:
610
jobs:
7-
devcontainer-build:
8-
uses: datajoint/.github/.github/workflows/devcontainer-build.yaml@main
911
tests:
1012
runs-on: ubuntu-latest
1113
strategy:
1214
matrix:
1315
py_ver: ["3.9", "3.10"]
14-
mysql_ver: ["8.0", "5.7"]
15-
include:
16-
- py_ver: "3.8"
17-
mysql_ver: "5.7"
18-
- py_ver: "3.7"
19-
mysql_ver: "5.7"
16+
mysql_ver: ["8.0"]
2017
steps:
2118
- uses: actions/checkout@v3
2219
- name: Set up Python ${{matrix.py_ver}}
@@ -31,4 +28,4 @@ jobs:
3128
run: |
3229
python_version=${{matrix.py_ver}}
3330
black element_array_ephys --check --verbose --target-version py${python_version//.}
34-
31+
black notebooks --check --verbose --target-version py${python_version//.}

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ exclude: (^.github/|^docs/|^images/)
33

44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v4.4.0
6+
rev: v4.5.0
77
hooks:
88
- id: trailing-whitespace
99
- id: end-of-file-fixer
@@ -16,7 +16,7 @@ repos:
1616

1717
# black
1818
- repo: https://github.com/psf/black
19-
rev: 22.12.0
19+
rev: 24.2.0
2020
hooks:
2121
- id: black
2222
- id: black-jupyter
@@ -25,15 +25,15 @@ repos:
2525

2626
# isort
2727
- repo: https://github.com/pycqa/isort
28-
rev: 5.11.2
28+
rev: 5.13.2
2929
hooks:
3030
- id: isort
3131
args: ["--profile", "black"]
3232
description: Sorts imports in an alphabetical order
3333

3434
# flake8
3535
- repo: https://github.com/pycqa/flake8
36-
rev: 4.0.1
36+
rev: 7.0.0
3737
hooks:
3838
- id: flake8
3939
args: # arguments to configure flake8

0 commit comments

Comments
 (0)