Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge conflict #182

Merged
merged 16 commits into from
Feb 1, 2024
Merged

Fix merge conflict #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
03433c7
revert: :memo: revert style change to fix black table text
A-Baji Nov 16, 2023
3b0e03e
Merge pull request #173 from A-Baji/main
kushalbakshi Dec 8, 2023
63508e4
Update tutorial notebook and minor fixes
kushalbakshi Dec 19, 2023
1e64cb9
Black formatting
kushalbakshi Dec 19, 2023
0a0f166
Merge pull request #175 from kushalbakshi/tutorial
MilagrosMarin Dec 20, 2023
baec431
Minor fixes to notebooks
kushalbakshi Jan 11, 2024
8df25af
Update version and CHANGELOG
kushalbakshi Jan 11, 2024
63ef0c9
Merge pull request #176 from datajoint/notebook-fix
Jan 11, 2024
e514ff7
Merge pull request #3 from datajoint/main
Jan 18, 2024
012124e
Updates to package requirements + formatting with `black`
kushalbakshi Jan 29, 2024
b6b4b69
Merge pull request #177 from kushalbakshi/main
Jan 29, 2024
bc63a6e
Merge pull request #4 from datajoint/caiman_per_plane_processing
Feb 1, 2024
2480906
Merge pull request #164 from ttngu207/main
kushalbakshi Feb 1, 2024
f32dd8d
Merge branch 'main' of https://github.com/datajoint/element-calcium-i…
Feb 1, 2024
89a39be
fix(setup): fix incorrect merge conflict resolution
Feb 1, 2024
d40da2a
fix(setting): black formatting
Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
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.9.3] - 2024-01-29

+ Update - DataJoint Elements to install from GitHub instead of PyPI
+ Fix - `element-interface` required during package installation
+ Fix - apply formatting with `black` across the repository

## [0.9.2] - 2024-01-10

+ Fix - Imports and attribute values in notebooks to resolve DataJoint errors

## [0.9.1] - 2023-12-19

+ Update - Tutorial notebook
+ Fix - minor fixes in `setup.py` and `README`

## [0.9.0] - 2023-10-13

+ Add - Export to NWB and upload to DANDI
Expand Down Expand Up @@ -181,6 +196,10 @@ 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.9.3]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.9.3
[0.9.2]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.9.2
[0.9.1]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.9.1
[0.9.0]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.9.0
[0.8.1]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.8.1
[0.8.0]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.8.0
[0.7.9]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.7.9
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ documentation page.
+ Clone the repository to your computer

```bash
git clone https://github.com/<enter_github_username>/element-calcium-imaging
git clone https://github.com/<enter_github_username>/element-calcium-imaging.git
```

+ Install with `pip`
Expand Down
3 changes: 1 addition & 2 deletions docs/src/.overrides/assets/stylesheets/extra.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ html a[title="YouTube"].md-social__link svg {
/* --md-footer-fg-color: var(--dj-white); */
}

[data-md-color-scheme="slate"] td,
th {
[data-md-color-scheme="slate"] .jupyter-wrapper .Table Td {
color: var(--dj-black)
}
2 changes: 1 addition & 1 deletion element_calcium_imaging/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Package metadata."""

__version__ = "0.9.2"
__version__ = "0.9.3"
636 changes: 628 additions & 8 deletions notebooks/demo.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

284 changes: 203 additions & 81 deletions notebooks/quality_metrics.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

14,401 changes: 448 additions & 13,953 deletions notebooks/tutorial.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
"ipykernel>=6.0.1",
"ipywidgets",
"plotly",
"element-interface @ git+https://github.com/datajoint/element-interface.git",
],
extras_require={
"caiman_requirements": [caiman_requirements],
"caiman": ["caiman @ git+https://github.com/datajoint/CaImAn.git"],
"elements": [
"element-animal>=0.1.8",
"element-event>=0.2.3",
"element-interface @ git+https://github.com/datajoint/element-interface.git@staging",
"element-lab>=0.3.0",
"element-session>=0.1.5",
"element-animal @ git+https://github.com/datajoint/element-animal.git",
"element-event @ git+https://github.com/datajoint/element-event.git",
"element-lab @ git+https://github.com/datajoint/element-lab.git",
"element-session @ git+https://github.com/datajoint/element-session.git",
],
"extract": ["matlabengine", "scipy"],
"nd2": ["nd2"],
Expand Down
Loading