Skip to content

Commit

Permalink
Merge pull request #32 from CBroz1/dev
Browse files Browse the repository at this point in the history
Revise pytesting, update docker, add QC notebook
  • Loading branch information
kushalbakshi authored Jan 11, 2023
2 parents 44fd958 + cfe7bae commit d91409b
Show file tree
Hide file tree
Showing 51 changed files with 2,021 additions and 796 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ coverage.xml
.hypothesis/
.pytest_cache/
docker-compose.y*ml
!docker/docker-compose.y*ml

# C extension, Translations
# editors: vscode, emacs, Mac
Expand Down Expand Up @@ -73,3 +74,4 @@ dj_local_c*.json
temp*
*nwb
**-jvsc-*.py
/tests/user_data/*
4 changes: 2 additions & 2 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
MD009: false # permit trailing spaces
MD007: false # List indenting - permit 4 spaces
MD013:
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:
allowed_elements:
- "br"
MD034: false # Permit bare URLs
MD031: false # Spacing w/code blocks. Conflicts with `??? Note` and code tab styling
Expand Down
5 changes: 3 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default_stages: [commit, push]
exclude: (^.github/|^docs/|^images/)
exclude: (^.github/|^docs/|^images/|^notebooks/py_scripts/)

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand All @@ -22,6 +22,7 @@ repos:
- id: black-jupyter
args:
- --line-length=88
- --exclude=notebooks/py_scripts

# isort
- repo: https://github.com/pycqa/isort
Expand Down Expand Up @@ -54,4 +55,4 @@ repos:
# W605 - a backslash-character pair that is not a valid escape sequence now
# generates a DeprecationWarning. This will eventually become a SyntaxError.
# Needed because we use \d as an escape sequence
# E402 - Import not at top of file - for notebook scripts
# E402 - Import not at top of file - for notebook scripts
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and

+ Add - Apply `black` formatting to codebase
+ Update - Move `recursive_search` function
+ Update - Revise Pytests/docker structure
+ Update - Add reference schema for supplemental tables
+ Add - Visualization notebook

## 0.2.0 - 2022-07-11

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Element is a modular pipeline for data storage and processing with corresponding
database tables that can be combined with other Elements to assemble a fully functional
pipeline.

Installation and usage instructions can be found at the [Element documentation](https://datajoint.com/docs/elements/element-miniscope).
Installation and usage instructions can be found at the
[Element documentation](https://datajoint.com/docs/elements/element-miniscope).

![element miniscope diagram](images/attached_miniscope_element.svg)
53 changes: 53 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// 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"
],
// 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": [
],
"words": [
"Theo",
"filt",
"djarchive",
"tsub",
"ssub",
"stim",
"trialized",
"rval",
"curations",
"npix",
"nchannels",
"nframes",
"nsamples",
"neuropil",
"POSIX",
"deconvolution",
"neuro",
"pyplot",
"imshow",
"xpix",
"ypix",
"dtype",
"twinx",
"deconvolved",
"xlabel",
"ylabel",
"PSTH",
"iterrows",
"cmap",
"axvline",
"axvline",
"xlim",
"ephys",
"tqdm",
"Pytests"
]
}
25 changes: 25 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
FROM datajoint/djbase:py3.9-debian-8eb1715

USER anaconda:anaconda

COPY ./workflow-miniscope/docker/apt_requirements.txt /tmp/
RUN /entrypoint.sh echo "Installed dependencies."

WORKDIR /main/workflow-miniscope

# Always move local - conditional install in setup.sh
COPY --chown=anaconda:anaconda ./element-lab/ /main/element-lab/
COPY --chown=anaconda:anaconda ./element-animal/ /main/element-animal/
COPY --chown=anaconda:anaconda ./element-session/ /main/element-session/
COPY --chown=anaconda:anaconda ./element-event/ /main/element-event/
COPY --chown=anaconda:anaconda ./element-interface/ /main/element-interface/
COPY --chown=anaconda:anaconda ./element-miniscope/ /main/element-miniscope/
COPY --chown=anaconda:anaconda ./workflow-miniscope/ /main/workflow-miniscope/

# Conditional install - local-all, local-dlc, or git
COPY --chown=anaconda:anaconda ./workflow-miniscope/docker/setup.sh /main/
COPY --chown=anaconda:anaconda ./workflow-miniscope/docker/.env /main/
RUN chmod 755 /main/setup.sh
RUN chmod 755 /main/.env
RUN /main/setup.sh
RUN rm -f ./dj_local_conf.json
47 changes: 0 additions & 47 deletions docker/Dockerfile.dev

This file was deleted.

50 changes: 0 additions & 50 deletions docker/Dockerfile.test

This file was deleted.

38 changes: 0 additions & 38 deletions docker/docker-compose-dev.yaml

This file was deleted.

68 changes: 0 additions & 68 deletions docker/docker-compose-test.yaml

This file was deleted.

Loading

0 comments on commit d91409b

Please sign in to comment.