Skip to content

Commit 4646e9e

Browse files
authored
Merge pull request #27 from CBroz1/dj
blackify
2 parents 89a7bc4 + 0e26be2 commit 4646e9e

File tree

5 files changed

+397
-292
lines changed

5 files changed

+397
-292
lines changed

.gitignore

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,10 @@ wheels/
2828
*.egg
2929
.idea/
3030

31-
# PyInstaller
32-
# Usually these files are written by a python script from a template
33-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
31+
# PyInstaller, Installer logs
3432
*.manifest
3533
*.spec
36-
37-
# Installer logs
38-
pip-log.txt
39-
pip-delete-this-directory.txt
34+
pip-*.txt
4035

4136
# Unit test / coverage reports
4237
htmlcov/
@@ -49,26 +44,18 @@ coverage.xml
4944
*.cover
5045
.hypothesis/
5146

52-
# Translations
47+
# Translations, Django, Flask
5348
*.mo
5449
*.pot
55-
56-
# Django stuff:
5750
*.log
5851
local_settings.py
59-
60-
# Flask stuff:
6152
instance/
6253
.webassets-cache
6354

64-
# Scrapy stuff:
55+
# Scrapy stuff, Sphinx, PyBuilder
6556
.scrapy
6657
scratchpaper.*
67-
68-
# Sphinx documentation
6958
docs/_build/
70-
71-
# PyBuilder
7259
target/
7360

7461
# Jupyter Notebook
@@ -77,25 +64,19 @@ target/
7764
# pyenv
7865
.python-version
7966

80-
# celery beat schedule file
67+
# celery beat, SageMath
8168
celerybeat-schedule
82-
83-
# SageMath parsed files
8469
*.sage.py
8570

86-
# dotenv
71+
# dotenv, virtualenv
8772
./.env
88-
89-
# virtualenv
9073
.venv
9174
venv/
9275
ENV/
9376

94-
# Spyder project settings
77+
# Spyder/Rope project settings
9578
.spyderproject
9679
.spyproject
97-
98-
# Rope project settings
9980
.ropeproject
10081

10182
# mkdocs documentation
@@ -105,8 +86,8 @@ ENV/
10586
.mypy_cache/
10687

10788
# datajoint
108-
dj_local_conf.json
109-
dj_local_conf_old.json
89+
dj_local_con*.json
90+
temp*
11091

11192
# emacs
11293
**/*~

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

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

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

1112
## 0.1.1 - 2021-04-01
1213
+ Add - Load data acquired with Miniscope-DAQ-V3
13-
+ Add - Load data analyzed with MiniscopeAnalysis
14+
+ Add - Load data analyzed with MiniscopeAnalysis

0 commit comments

Comments
 (0)