Skip to content

Commit

Permalink
Merge pull request #151 from kabilar/main
Browse files Browse the repository at this point in the history
Patch issue with nullable attributes
  • Loading branch information
dimitri-yatsenko authored Jun 30, 2023
2 parents 3678efb + 9543d26 commit 868d4e3
Show file tree
Hide file tree
Showing 8 changed files with 11,145 additions and 97 deletions.
1 change: 0 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ RUN \
pip install --no-cache-dir --upgrade black pip && \
echo '. /etc/bash_completion' >> /home/vscode/.bashrc && \
echo 'export PS1="\[\e[32;1m\]\u\[\e[m\]@\[\e[34;1m\]\H\[\e[m\]:\[\e[33;1m\]\w\[\e[m\]$ "' >> /home/vscode/.bashrc && \
# dircolors -b >> /home/vscode/.bashrc && \ # somehow fix colors
apt-get clean

COPY ./ /tmp/element-calcium-imaging/
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
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.7.6] - 2023-06-30

+ Add - Null value for `package_version` in `imaging*` modules to patch bug
+ Update - `tutorial.ipynb` notebook to insert values for nullable attributes

## [0.7.5] - 2023-06-20

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

[0.7.6]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.6
[0.7.5]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.5
[0.7.4]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.4
[0.7.3]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.3
Expand Down
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![PyPI version](https://badge.fury.io/py/element-calcium-imaging.svg)](http://badge.fury.io/py/element-calcium-imaging)

# DataJoint Element - Functional Calcium Imaging
# DataJoint Element for Functional Calcium Imaging

DataJoint Element for functional calcium imaging with
[ScanImage](https://docs.scanimage.org/),
Expand All @@ -13,7 +13,8 @@ and `Bruker Prairie View` acquisition software; and
software. DataJoint Elements collectively standardize and automate
data collection and analysis for neuroscience experiments. Each 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. This repository also provides a tutorial environment and notebooks to learn the pipeline.
combined with other Elements to assemble a fully functional pipeline. This repository
also provides a tutorial environment and notebooks to learn the pipeline.

## Experiment Flowchart

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

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

+ 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.
+ 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.

## Getting Started


+ Install from PyPI

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

## Support

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

## Interactive Tutorial

Expand Down
2 changes: 1 addition & 1 deletion element_calcium_imaging/imaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ def make(self, key):
else:
raise ValueError(f"Unknown task mode: {task_mode}")

self.insert1(key)
self.insert1({**key, "package_version": ""})


@schema
Expand Down
2 changes: 1 addition & 1 deletion element_calcium_imaging/imaging_no_curation.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ def make(self, key):
else:
raise ValueError(f"Unknown task mode: {task_mode}")

self.insert1(key)
self.insert1({**key, "package_version": ""})


# -------------- Motion Correction --------------
Expand Down
4 changes: 2 additions & 2 deletions element_calcium_imaging/imaging_preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def make(self, key):
else:
raise ValueError(f"Unknown task mode: {task_mode}")

self.insert1(key)
self.insert1({**key, "package_version": ""})


@schema
Expand Down Expand Up @@ -741,7 +741,7 @@ def make(self, key):
else:
raise ValueError(f"Unknown task mode: {task_mode}")

self.insert1(key)
self.insert1({**key, "package_version": ""})


@schema
Expand Down
2 changes: 1 addition & 1 deletion element_calcium_imaging/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""Package metadata."""
__version__ = "0.7.5"
__version__ = "0.7.6"
Loading

0 comments on commit 868d4e3

Please sign in to comment.