Skip to content

Commit

Permalink
Merge pull request #27 from CBroz1/dj
Browse files Browse the repository at this point in the history
blackify
  • Loading branch information
kabilar authored May 13, 2022
2 parents 89a7bc4 + 0e26be2 commit 4646e9e
Show file tree
Hide file tree
Showing 5 changed files with 397 additions and 292 deletions.
37 changes: 9 additions & 28 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,10 @@ wheels/
*.egg
.idea/

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
# PyInstaller, Installer logs
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt
pip-*.txt

# Unit test / coverage reports
htmlcov/
Expand All @@ -49,26 +44,18 @@ coverage.xml
*.cover
.hypothesis/

# Translations
# Translations, Django, Flask
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
# Scrapy stuff, Sphinx, PyBuilder
.scrapy
scratchpaper.*

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
Expand All @@ -77,25 +64,19 @@ target/
# pyenv
.python-version

# celery beat schedule file
# celery beat, SageMath
celerybeat-schedule

# SageMath parsed files
*.sage.py

# dotenv
# dotenv, virtualenv
./.env

# virtualenv
.venv
venv/
ENV/

# Spyder project settings
# Spyder/Rope project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
Expand All @@ -105,8 +86,8 @@ ENV/
.mypy_cache/

# datajoint
dj_local_conf.json
dj_local_conf_old.json
dj_local_con*.json
temp*

# emacs
**/*~
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.

## Unreleased - 2022-04-25
## 0.1.2 - 2022-05-10
+ Add - Load data acquired with Miniscope-DAQ-V4
+ Add - Load data analyzed with CaImAn
+ Add - Trigger CaImAn analysis
+ Remove - Load data analyzed with MiniscopeAnalysis
+ Add - Adopted black formatting into code base

## 0.1.1 - 2021-04-01
+ Add - Load data acquired with Miniscope-DAQ-V3
+ Add - Load data analyzed with MiniscopeAnalysis
+ Add - Load data analyzed with MiniscopeAnalysis
Loading

0 comments on commit 4646e9e

Please sign in to comment.