Merge pull request #124 from CBroz1/main

Cleanup docstrings, add notebook render
datajoint · Jan 19, 2023 · d5b9586 · d5b9586
2 parents eababbc + 4796056
commit d5b9586
Show file tree

Hide file tree

Showing 31 changed files with 671 additions and 392 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,6 +102,7 @@ ENV/
 
 # mkdocs documentation
 docs/site
+docs/src/tutorials/*ipynb
 
 # mypy
 .mypy_cache/

diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
@@ -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
 
@@ -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.
@@ -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
@@ -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

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,4 +1,3 @@
-
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -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.
diff --git a/LICENSE b/LICENSE
@@ -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

diff --git a/cspell.json b/cspell.json
@@ -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"
+    ]
+}
diff --git a/docs/.docker/pip_requirements.txt b/docs/.docker/pip_requirements.txt
@@ -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
diff --git a/docs/docker-compose.yaml b/docs/docker-compose.yaml
@@ -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

diff --git a/docs/mkdocs.yaml b/docs/mkdocs.yaml
@@ -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
@@ -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
@@ -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
@@ -100,6 +118,8 @@ plugins:
   - exclude-search:
       exclude:
         - "*/navigation.md"
+  - mkdocs-jupyter:
+      ignore_h1_titles: True
 markdown_extensions:
   - attr_list
   - toc:
@@ -120,6 +140,7 @@ markdown_extensions:
       linenums: true
   - pymdownx.inlinehilite
   - pymdownx.snippets
+  - footnotes
 
 extra:
   PATCH_VERSION: !ENV PATCH_VERSION
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		# Contributor Covenant Code of Conduct

		## Our Pledge
Expand Down