Skip to content

Commit 9337f3f

Browse files
authored
Merge pull request #14 from MilagrosMarin/dev-milagros
Feat: refactor with schema restructuring, new table, dependency updates, and code cleanup
2 parents 77c3fe1 + f9f26ac commit 9337f3f

18 files changed

+3454
-2720
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
]
2828
}
2929
}
30-
}
30+
}

.devcontainer/docker-compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ services:
2323
privileged: true # only because of dind
2424
volumes:
2525
docker_data:
26-

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ dj_local_c*.json
112112
dj_*.y*ml
113113
temp*
114114
temp/*
115+
test_*
116+
example_*
115117

116118
# docs
117119
/docs/site

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ repos:
4545

4646
# these are errors that will be ignored by flake8
4747
# https://www.flake8rules.com/rules/{code}.html
48-
- "--ignore=E203,E501,W503,W605,E402"
48+
- "--ignore=E203,E501,W503,W605,E402,F401"
4949
# E203 - Colons should not have any space before them.
5050
# Needed for list indexing
5151
# E501 - Line lengths are recommended to be no greater than 79 characters.

CHANGELOG.md

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
# Changelog
22

3-
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
3+
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+
7+
## [0.3.0] - 2025-06-07
8+
9+
+ Feat - Created new `SelectedFullFit` table to register selected trained models for downstream inference
10+
+ Feat - Updated pipeline architecture by inverting dependency direction:`moseq_infer.PoseEstimationMethod` is moved from `moseq_infer` to `moseq_train` and now the new table `SelectedFullFit` is a nullable foreign key in `moseq_infer.Model`.
11+
+ Fix - Updated imports and foreign key references across schemas to match new structure.
12+
+ Fix - `pre-commit` hooks to exclude removal of used dependencies into the table definitions (`F401`).
13+
+ Add - Refactored `setup.py` to organize dependencies more cleanly and into optional dependencies.
14+
+ Add - Refactored schema activation logic.
15+
+ Add - Adjusted `tutorial_pipeline.py` to reflect the new hierarchy
16+
+ Add - Aligned schema design with DataJoint Element conventions to support modular reuse and testing
17+
+ Add - Update `images` according to these changes
18+
+ Add - Update `tutorial.ipynb` to reflect these changes.
19+
+ Add - Style and minor bug fixes.
20+
621
## [0.2.3] - 2025-04-12
722

823
+ Fix - `moseq_train` to import `keypoint_moseq` functions inside `trigger` mode
@@ -27,7 +42,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
2742
+ Update - tutorial content
2843
+ Fix - `scipy.linalg` deprecation in latest release by adjusting version in `setup.py`
2944
+ Update - `pre_kappa` and `full_kappa` to integer to simplify equality comparisons
30-
+ Update - `images` of the pipeline
45+
+ Update - `images` of the pipeline
3146

3247
## [0.1.1] - 2024-03-21
3348

@@ -41,16 +56,16 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
4156
+ Fix - `Dockerfile` environment variables
4257
+ Update - Activation of one schema with two modules by updating `tutorial_pipeline.ipynb`
4358
+ Update - remove PyPI release from `release.yml`
44-
+ Update - README
59+
+ Update - README
4560

4661
## [0.1.0] - 2024-03-20
4762

4863
+ Add - `CHANGELOG` and version for first release
4964
+ Add - DevContainer configuration for GitHub Codespaces
5065
+ Add - Updated documentation in `docs` for schemas and tutorial
5166
+ Add - `kpms_reader` readers
52-
+ Add - `element_moseq` pipeline architecture and design containing `kpms_pca` and `kpms_model` modules
53-
+ Add - `images` with flowchart and pipeline images
67+
+ Add - `element_moseq` pipeline architecture and design containing `kpms_pca` and `kpms_model` modules
68+
+ Add - `images` with flowchart and pipeline images
5469
+ Add - `tutorial.ipynb` consistent across DataJoint Elements that can be launched using GitHub Codespaces
5570
+ Add - `tutorial_pipeline.py` script for notebooks to import and activate schemas
5671
+ Add - spelling, markdown, and pre-commit config files

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ DataJoint Elements collectively standardize and automate data collection and ana
3434

3535
## Support
3636

37-
+ If you need help getting started or run into any errors, please open a GitHub Issue
37+
+ If you need help getting started or run into any errors, please open a GitHub Issue
3838
or contact our team by email at support@datajoint.com.
3939

4040
## Interactive Tutorial
@@ -72,4 +72,4 @@ MYSQL_VER=8.0 docker compose -f docker-compose-db.yaml up --build -d
7272

7373
1. We recommend you start by navigating to the `notebooks` directory on the left panel and go through the `tutorial.ipynb` Jupyter notebook. Execute the cells in the notebook to begin your walkthrough of the tutorial.
7474

75-
2. Once you are done, see the options available to you in the menu in the bottom-left corner. For example, in Codespace you will have an option to `Stop Current Codespace` but when running Dev Container on your own machine the equivalent option is `Reopen folder locally`. By default, GitHub will also automatically stop the Codespace after 30 minutes of inactivity. Once the Codespace is no longer being used, we recommend deleting the Codespace.
75+
2. Once you are done, see the options available to you in the menu in the bottom-left corner. For example, in Codespace you will have an option to `Stop Current Codespace` but when running Dev Container on your own machine the equivalent option is `Reopen folder locally`. By default, GitHub will also automatically stop the Codespace after 30 minutes of inactivity. Once the Codespace is no longer being used, we recommend deleting the Codespace.

cspell.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,4 @@
207207
"yticks",
208208
"zpix"
209209
]
210-
}
210+
}

element_moseq/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
23
import datajoint as dj
34

45
if "custom" not in dj.config:

0 commit comments

Comments
 (0)