Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup docstrings, add notebook render #124

Merged
merged 26 commits into from
Jan 19, 2023
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a8e93d1
Merge branch 'main' of https://github.com/datajoint/element-array-ephys
CBroz1 May 10, 2022
5711a12
Merge branch 'main' of https://github.com/datajoint/element-array-ephys
CBroz1 Oct 11, 2022
31e46cd
Add nwb.py from run_kilosort branch
CBroz1 Oct 11, 2022
0ec5e3d
Update element_array_ephys/export/nwb/nwb.py
CBroz1 Oct 12, 2022
06db0f8
Merge branch 'main' of https://github.com/datajoint/element-array-ephys
CBroz1 Jan 10, 2023
147550c
Merge branch 'main' of https://github.com/JaerongA/element-array-ephys
CBroz1 Jan 11, 2023
b250f2d
Merge branch 'main' of https://github.com/datajoint/element-array-ephys
CBroz1 Jan 12, 2023
0e5a1c6
blackify
CBroz1 Jan 12, 2023
b3c0786
Remove unused import
CBroz1 Jan 12, 2023
ea980e9
Spellcheck pass
CBroz1 Jan 12, 2023
4ef0b6d
Update License 2023
CBroz1 Jan 12, 2023
64e7dc6
More spellcheck; Markdown linting
CBroz1 Jan 12, 2023
96bb6fa
Add tutorial notebook renders
CBroz1 Jan 12, 2023
0980242
Fix docstrings
CBroz1 Jan 12, 2023
56eb68a
Spelling
CBroz1 Jan 12, 2023
e01683c
Add extras_require for dev and nwb
CBroz1 Jan 13, 2023
9d03350
Version bump, changelog
CBroz1 Jan 13, 2023
8045879
add extras_require nwb install option to docs
CBroz1 Jan 13, 2023
9ff2e04
interface requirement to pip installable
CBroz1 Jan 13, 2023
888e7f7
Fix typing bug
CBroz1 Jan 17, 2023
45f846c
Adjust dependencies
CBroz1 Jan 18, 2023
a28cf13
Adjust dependencies 2
CBroz1 Jan 18, 2023
4d9ab28
fix: :bug: import from __future__ module
JaerongA Jan 18, 2023
084ada2
Merge branch 'main' into main
CBroz1 Jan 18, 2023
fd94939
Merge pull request #3 from JaerongA/main
CBroz1 Jan 18, 2023
4796056
Apply suggestions from code review
CBroz1 Jan 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ ENV/

# mkdocs documentation
docs/site
docs/src/tutorials/*ipynb

# mypy
.mypy_cache/
Expand Down
16 changes: 16 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Markdown Linter configuration for docs
# https://github.com/DavidAnson/markdownlint
# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
MD009: false # permit trailing spaces
MD007: false # List indenting - permit 4 spaces
MD013:
line_length: "88" # Line length limits
tables: false # disable for tables
headings: false # disable for headings
MD030: false # Number of spaces after a list
MD033: # HTML elements allowed
allowed_elements:
- "br"
MD034: false # Permit bare URLs
MD031: false # Spacing w/code blocks. Conflicts with `??? Note` and code tab styling
MD046: false # Spacing w/code blocks. Conflicts with `??? Note` and code tab styling
32 changes: 23 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,34 @@
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.

## [0.2.3] - Unreleased

+ Add - extras_require install options for nwb and development requirement sets
+ Add - mkdocs notebook rendering
+ Add - markdown linting and spellcheck config files, with implementation edits
+ Update - license for 2023
+ Update - blackify previous updates

## [0.2.2] - 2022-01-11

+ Bugfix - Revert import order in `__init__.py` to avoid circular import error.
+ Update - `.pre-commit-config.yaml` to disable automatic positioning of import statement at the top.
+ Update - `.pre-commit-config.yaml` to disable automatic positioning of import
statement at the top.
+ Bugfix - Update docstrings to render API for documentation website.

## [0.2.1] - 2022-01-06

+ Add - `build_electrode_layouts` function in `probe.py` to compute the electrode layout for all types of probes.
+ Update - parameterize run_CatGT step from parameters retrieved from `ClusteringParamSet` table
+ Add - `build_electrode_layouts` function in `probe.py` to compute the electrode layout
for all types of probes.
+ Update - parameterize run_CatGT step from parameters retrieved from
`ClusteringParamSet` table
+ Update - clustering step, update duration for "median_subtraction" step
+ Bugfix - handles single probe recording in "Neuropix-PXI" format
+ Update - safeguard in creating/inserting probe types upon probe activation
+ Add - quality control metric dashboard
+ Update & fix docstrings
+ Update - `ephys_report.UnitLevelReport` to add `ephys.ClusterQualityLabel` as a foreign key reference
+ Update - `ephys_report.UnitLevelReport` to add `ephys.ClusterQualityLabel` as a
foreign key reference
+ Add - `.pre-commit-config.yaml`

## [0.2.0] - 2022-10-28
Expand All @@ -28,15 +40,17 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
+ Add - Add `ephys_no_curation` and routines to trigger spike-sorting analysis
using Kilosort (2.0, 2.5)
+ Add - mkdocs for Element Documentation
+ Add - New `QualityMetrics` table to store clusters' and waveforms' metrics after the spike sorting analysis.
+ Add - New `QualityMetrics` table to store clusters' and waveforms' metrics after the
spike sorting analysis.

## [0.1.4] - 2022-07-11

+ Bugfix - Handle case where `spike_depths` data is present.

## [0.1.3] - 2022-06-16

+ Update - Allow for the `precluster_output_dir` attribute to be nullable when no pre-clustering is performed.
+ Update - Allow for the `precluster_output_dir` attribute to be nullable when no
pre-clustering is performed.

## [0.1.2] - 2022-06-09

Expand All @@ -49,7 +63,8 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
## [0.1.0] - 2022-05-26

+ Update - Rename module for acute probe insertions from `ephys.py` to `ephys_acute.py`.
+ Add - Module for pre-clustering steps (`ephys_precluster.py`), which is built off of `ephys_acute.py`.
+ Add - Module for pre-clustering steps (`ephys_precluster.py`), which is built off of
`ephys_acute.py`.
+ Add - Module for chronic probe insertions (`ephys_chronic.py`).
+ Bugfix - Missing `fileTimeSecs` key in SpikeGLX meta file.
+ Update - Move common functions to `element-interface` package.
Expand All @@ -59,7 +74,6 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and

+ Add - Processing with Kilosort and pyKilosort for Open Ephys and SpikeGLX


## [0.1.0b0] - 2021-05-07

+ Update - First beta release
Expand All @@ -72,7 +86,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
+ Add - Probe table supporting: Neuropixels probes 1.0 - 3A, 1.0 - 3B, 2.0 - SS,
2.0 - MS


[0.2.3]: https://github.com/datajoint/element-array-ephys/releases/tag/0.2.3
[0.2.2]: https://github.com/datajoint/element-array-ephys/releases/tag/0.2.2
[0.2.1]: https://github.com/datajoint/element-array-ephys/releases/tag/0.2.1
[0.2.0]: https://github.com/datajoint/element-array-ephys/releases/tag/0.2.0
Expand Down
1 change: 0 additions & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Contributor Covenant Code of Conduct

## Our Pledge
Expand Down
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Contribution Guidelines

This project follows the [DataJoint Contribution Guidelines](https://datajoint.com/docs/community/contribute/). Please reference the link for more full details.
This project follows the
[DataJoint Contribution Guidelines](https://datajoint.com/docs/community/contribute/).
Please reference the link for more full details.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 DataJoint NEURO
Copyright (c) 2023 DataJoint

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
156 changes: 156 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
// cSpell Settings
//https://github.com/streetsidesoftware/vscode-spell-checker
{
"version": "0.2", // Version of the setting file. Always 0.2
"language": "en", // language - current active spelling language
"enabledLanguageIds": [
"markdown", "yaml", "python"
],
// flagWords - list of words to be always considered incorrect
// This is useful for offensive words and common spelling errors.
// For example "hte" should be "the"
"flagWords": [],
"allowCompoundWords": true,
"ignorePaths": [
"./element_array_ephys.egg-info/*",
"./images/*"
],
"words": [
"acorr",
"aggr",
"Alessio",
"Andreas",
"apmeta",
"arange",
"asarray",
"astype",
"autocorrelogram",
"Axona",
"bbins",
"bdist",
"Binarize",
"Brody",
"Buccino",
"catgt",
"cbar",
"cbin",
"cdat",
"Chans",
"chans",
"chns",
"Clust",
"clusterings",
"cmap",
"correlogram",
"correlograms",
"curations",
"DANDI",
"decomp",
"DISTRO",
"djbase",
"dtype",
"ecephys",
"electrophysiogical",
"elif",
"Ephys",
"gblcar",
"gfix",
"hdmf",
"HHMI",
"hstack",
"ibllib",
"ifnull",
"Imax",
"IMAX",
"imax",
"imec",
"imread",
"imro",
"imrotbl",
"imshow",
"inlinehilite",
"ipynb",
"ipywidgets",
"kcoords",
"Klusta",
"Kwik",
"lfmeta",
"linenums",
"mdict",
"Mesoscale",
"mkdocs",
"mkdocstrings",
"Moser",
"mtscomp",
"Nchan",
"nchan",
"ndarray",
"ndim",
"ndimage",
"Neuralynx",
"NEURO",
"neuroconv",
"Neurodata",
"Neuropix",
"neuropixel",
"NeuroPixels",
"nwbfile",
"NWBHDF",
"oebin",
"openephys",
"openephys",
"openpyxl",
"phylog",
"plotly",
"PSTH",
"pykilosort",
"pymdownx",
"pynwb",
"pyopenephys",
"pyplot",
"pytest",
"Reimer",
"repolarization",
"Roboto",
"RRID",
"Rxiv",
"Sasaki",
"scipy",
"sdist",
"Siegle",
"sess",
"SGLX",
"Shen",
"Sitonic",
"spikeglx",
"spkcount",
"Stereotaxic",
"tcat",
"tickvals",
"tofile",
"Tolias",
"tqdm",
"vline",
"Vmax",
"vmax",
"xanchor",
"xaxes",
"xaxis",
"xcoords",
"xcorr",
"xlabel",
"xlim",
"XPOS",
"xtick",
"Yatsenko",
"yaxes",
"yaxis",
"ycoord",
"ycoords",
"ylabel",
"ylim",
"YPOS",
"yref",
"yticks"
]
}
3 changes: 2 additions & 1 deletion docs/.docker/pip_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ mdx-truly-sane-lists
mkdocs-gen-files
mkdocs-literate-nav
mkdocs-exclude-search
mkdocs-markdownextradata-plugin
mkdocs-markdownextradata-plugin
mkdocs-jupyter
10 changes: 9 additions & 1 deletion docs/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,17 @@ services:
- |
git config --global --add safe.directory /main
set -e
export ELEMENT_UNDERSCORE=$$(echo $${PACKAGE} | sed 's/element_//g')
export ELEMENT_HYPHEN=$$(echo $${ELEMENT_UNDERSCORE} | sed 's/_/-/g')
export PATCH_VERSION=$$(cat /main/$${PACKAGE}/version.py | grep -oE '\d+\.\d+\.[a-z0-9]+')
git clone https://github.com/datajoint/workflow-$${ELEMENT_HYPHEN}.git /main/delete || true
if [ -d /main/delete/ ]; then
mv /main/delete/workflow_$${ELEMENT_UNDERSCORE} /main/
mv /main/delete/notebooks/*ipynb /main/docs/src/tutorials/
rm -fR /main/delete
fi
if echo "$${MODE}" | grep -i live &>/dev/null; then
mkdocs serve --config-file ./docs/mkdocs.yaml -a 0.0.0.0:80
mkdocs serve --config-file ./docs/mkdocs.yaml -a 0.0.0.0:80 2>&1 | tee docs/temp_mkdocs.log
elif echo "$${MODE}" | grep -iE "qa|push" &>/dev/null; then
echo "INFO::Delete gh-pages branch"
git branch -D gh-pages || true
Expand Down
33 changes: 27 additions & 6 deletions docs/mkdocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,31 @@ repo_name: datajoint/element-array-ephys
nav:
- Element Array Ephys: index.md
- Concepts: concepts.md
- Tutorials: tutorials.md
- Tutorials:
- Overview: tutorials/index.md
- Data Download: tutorials/00-data-download-optional.ipynb
- Configure: tutorials/01-configure.ipynb
- Workflow Structure: tutorials/02-workflow-structure-optional.ipynb
- Process: tutorials/03-process.ipynb
- Automate: tutorials/04-automate-optional.ipynb
- Explore: tutorials/05-explore.ipynb
- Drop: tutorials/06-drop-optional.ipynb
- Downstream Analysis: tutorials/07-downstream-analysis.ipynb
- Visualizations: tutorials/10-data_visualization.ipynb
- Electrode Localization: tutorials/08-electrode-localization.ipynb
- NWB Export: tutorials/09-NWB-export.ipynb
- Citation: citation.md
- API: api/ # defer to gen-files + literate-nav
- Changelog: changelog.md

# --------------------- NOTES TO CONTRIBUTORS -----------------------
# Markdown in mkdocs
# 01. Redering concatenates across single line breaks. This means...
# 01. Rendering concatenates across single line breaks. This means...
# A. We have to be careful to add extra line breaks around paragraphs,
# including between the end of a pgf and the beginnign of bullets.
# including between the end of a pgf and the beginning of bullets.
# B. We can use hard wrapping to make github reviews easier to read.
# VSCode Rewrap extension offers a keyboard shortcut for hard wrap
# at the ruler, but don't add breaks in [multiword links](example.com)
# at the ruler, but don't add breaks in [multi-word links](example.com)
# 02. Instead of designating codeblocks with bash, use console. For example..
# ```console
# cd ../my_dir
Expand All @@ -43,9 +55,9 @@ nav:
# HOST_UID=$(id -u) docker compose -f docs/docker-compose.yaml up --build
# ```
# 02. Site analytics depend on a local environment variable GOOGLE_ANALYTICS_KEY
# You can find this in LastPass or declare with any string to suprress errors
# You can find this in LastPass or declare with any string to suppress errors
# 03. The API section will pull docstrings.
# A. Follow google styleguide e.g.,
# A. Follow google style guide e.g.,
# https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html
# With typing suggestions: https://docs.python.org/3/library/typing.html
# B. To pull a specific workflow fork, change ./docs/src/api/make_pages.py#L19
Expand Down Expand Up @@ -92,6 +104,12 @@ plugins:
# "index.md": "getting_started.md"
- mkdocstrings:
default_handler: python
handlers:
python:
options:
members_order: source
group_by_category: false
line_length: 88
- gen-files:
scripts:
- ./src/api/make_pages.py
Expand All @@ -100,6 +118,8 @@ plugins:
- exclude-search:
exclude:
- "*/navigation.md"
- mkdocs-jupyter:
ignore_h1_titles: True
markdown_extensions:
- attr_list
- toc:
Expand All @@ -120,6 +140,7 @@ markdown_extensions:
linenums: true
- pymdownx.inlinehilite
- pymdownx.snippets
- footnotes

extra:
PATCH_VERSION: !ENV PATCH_VERSION
Expand Down
Loading