Skip to content

Commit 868d4e3

Browse files
Merge pull request #151 from kabilar/main
Patch issue with nullable attributes
2 parents 3678efb + 9543d26 commit 868d4e3

File tree

8 files changed

+11145
-97
lines changed

8 files changed

+11145
-97
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ RUN \
2222
pip install --no-cache-dir --upgrade black pip && \
2323
echo '. /etc/bash_completion' >> /home/vscode/.bashrc && \
2424
echo 'export PS1="\[\e[32;1m\]\u\[\e[m\]@\[\e[34;1m\]\H\[\e[m\]:\[\e[33;1m\]\w\[\e[m\]$ "' >> /home/vscode/.bashrc && \
25-
# dircolors -b >> /home/vscode/.bashrc && \ # somehow fix colors
2625
apt-get clean
2726

2827
COPY ./ /tmp/element-calcium-imaging/

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
44
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
55

6+
## [0.7.6] - 2023-06-30
7+
8+
+ Add - Null value for `package_version` in `imaging*` modules to patch bug
9+
+ Update - `tutorial.ipynb` notebook to insert values for nullable attributes
10+
611
## [0.7.5] - 2023-06-20
712

813
+ Update - Requirements
@@ -146,6 +151,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
146151
+ Add - `scan` and `imaging` modules
147152
+ Add - Readers for `ScanImage`, `ScanBox`, `Suite2p`, `CaImAn`
148153

154+
[0.7.6]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.6
149155
[0.7.5]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.5
150156
[0.7.4]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.4
151157
[0.7.3]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.3

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![PyPI version](https://badge.fury.io/py/element-calcium-imaging.svg)](http://badge.fury.io/py/element-calcium-imaging)
22

3-
# DataJoint Element - Functional Calcium Imaging
3+
# DataJoint Element for Functional Calcium Imaging
44

55
DataJoint Element for functional calcium imaging with
66
[ScanImage](https://docs.scanimage.org/),
@@ -13,7 +13,8 @@ and `Bruker Prairie View` acquisition software; and
1313
software. DataJoint Elements collectively standardize and automate
1414
data collection and analysis for neuroscience experiments. Each Element is a modular
1515
pipeline for data storage and processing with corresponding database tables that can be
16-
combined with other Elements to assemble a fully functional pipeline. This repository also provides a tutorial environment and notebooks to learn the pipeline.
16+
combined with other Elements to assemble a fully functional pipeline. This repository
17+
also provides a tutorial environment and notebooks to learn the pipeline.
1718

1819
## Experiment Flowchart
1920

@@ -23,11 +24,13 @@ combined with other Elements to assemble a fully functional pipeline. This repos
2324

2425
![pipeline](https://raw.githubusercontent.com/datajoint/element-calcium-imaging/main/images/pipeline_imaging.svg)
2526

26-
+ We have designed three variations of the pipeline to handle different use cases. Displayed above is the default `imaging` schema. Details on all of the `imaging` schemas can be found in the [Data Pipeline](https://datajoint.com/docs/elements/element-calcium-imaging/latest/pipeline/) documentation page.
27+
+ We have designed three variations of the pipeline to handle different use cases.
28+
Displayed above is the default `imaging` schema. Details on all of the `imaging`
29+
schemas can be found in the [Data Pipeline](https://datajoint.com/docs/elements/
30+
element-calcium-imaging/latest/pipeline/) documentation page.
2731

2832
## Getting Started
2933

30-
3134
+ Install from PyPI
3235

3336
```bash
@@ -40,7 +43,8 @@ combined with other Elements to assemble a fully functional pipeline. This repos
4043

4144
## Support
4245

43-
+ If you need help getting started or run into any errors, please contact our team by email at [email protected].
46+
+ If you need help getting started or run into any errors, please open a GitHub Issue
47+
or contact our team by email at [email protected].
4448

4549
## Interactive Tutorial
4650

element_calcium_imaging/imaging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ def make(self, key):
528528
else:
529529
raise ValueError(f"Unknown task mode: {task_mode}")
530530

531-
self.insert1(key)
531+
self.insert1({**key, "package_version": ""})
532532

533533

534534
@schema

element_calcium_imaging/imaging_no_curation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ def make(self, key):
528528
else:
529529
raise ValueError(f"Unknown task mode: {task_mode}")
530530

531-
self.insert1(key)
531+
self.insert1({**key, "package_version": ""})
532532

533533

534534
# -------------- Motion Correction --------------

element_calcium_imaging/imaging_preprocess.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def make(self, key):
262262
else:
263263
raise ValueError(f"Unknown task mode: {task_mode}")
264264

265-
self.insert1(key)
265+
self.insert1({**key, "package_version": ""})
266266

267267

268268
@schema
@@ -741,7 +741,7 @@ def make(self, key):
741741
else:
742742
raise ValueError(f"Unknown task mode: {task_mode}")
743743

744-
self.insert1(key)
744+
self.insert1({**key, "package_version": ""})
745745

746746

747747
@schema

element_calcium_imaging/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
"""Package metadata."""
2-
__version__ = "0.7.5"
2+
__version__ = "0.7.6"

0 commit comments

Comments
 (0)