Skip to content

Commit

Permalink
Merge branch 'anipose-loader' of https://github.com/neuroinformatics-…
Browse files Browse the repository at this point in the history
…unit/movement into anipose-loader

# Conflicts:
#	movement/io/load_poses.py
#	tests/test_unit/test_load_poses.py
  • Loading branch information
vigji committed Dec 10, 2024
2 parents 100008c + ead27dc commit 481e80b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
7 changes: 3 additions & 4 deletions movement/io/load_poses.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,9 @@ def from_numpy(

def from_file(
file_path: Path | str,
source_software: Literal["DeepLabCut",
"SLEAP",
"LightningPose",
"Anipose"] | None = None,
source_software: Literal[
"DeepLabCut", "SLEAP", "LightningPose", "Anipose"
],
fps: float | None = None,
**kwargs,
) -> xr.Dataset:
Expand Down
8 changes: 1 addition & 7 deletions tests/test_unit/test_load_poses.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,7 @@ def test_load_multi_individual_from_lp_file_raises():

@pytest.mark.parametrize(
"source_software",
[
"SLEAP",
"DeepLabCut",
"LightningPose",
"Anipose",
"Unknown",
],
["SLEAP", "DeepLabCut", "LightningPose", "Anipose", "Unknown"],
)
@pytest.mark.parametrize("fps", [None, 30, 60.0])
def test_from_file_delegates_correctly(source_software, fps):
Expand Down

0 comments on commit 481e80b

Please sign in to comment.