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.

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

Add the option for multiple views loading #197

Closed
wants to merge 66 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9a57287
First draft for function and tests
vigji May 30, 2024
0f2cd88
Added example using `median_filter()` and `savgol_filter()` (#193)
niksirbi May 31, 2024
8e20498
Refactored modules related to input-output (#194)
niksirbi Jun 3, 2024
53a9eff
[pre-commit.ci] pre-commit autoupdate (#202)
pre-commit-ci[bot] Jun 3, 2024
52ac099
Update supported Python versions (#208)
niksirbi Jun 6, 2024
a1c91e6
Accessor `compute_` to only validate required `position` data variabl…
lochhh Jun 7, 2024
cf0a6b1
Use raw string for ASCII art in CLI entrypoint (#212)
lochhh Jun 10, 2024
0114b91
Refactor validators (#204)
sfmig Jun 12, 2024
b123994
add missing __init__.py files (#215)
niksirbi Jun 12, 2024
e4eea35
Move logging.py inside utils (#216)
niksirbi Jun 12, 2024
bba9403
Add a ValidBboxesDataset class (#201)
sfmig Jun 13, 2024
bfe1640
Refactor validators tests (#207)
sfmig Jun 14, 2024
ba10263
Update python version in README.md (#221)
niksirbi Jun 14, 2024
2e406e1
added ruff rule to check for numpy2.0 compatibility (#227)
niksirbi Jun 18, 2024
7f6553b
Add bboxes sample data (#231)
sfmig Jun 28, 2024
1f774ed
[pre-commit.ci] pre-commit autoupdate (#233)
pre-commit-ci[bot] Jul 2, 2024
43f17d7
Re-organise API reference (#213)
niksirbi Jul 3, 2024
b98cac0
Make video download optional for sample datasets (#224)
niksirbi Jul 11, 2024
b27d7a2
Refactor `filtering` module to take DataArrays as input (#209)
lochhh Jul 17, 2024
292a374
Add citation information (#240)
adamltyson Jul 22, 2024
4830fd5
Small edits to ValidBboxesDataset (1/4) (#230)
sfmig Jul 22, 2024
242f532
Add a ValidVIAtracksCSV class (2/4) (#219)
sfmig Jul 22, 2024
d943b29
Getting started docs update for bboxes (#245)
sfmig Jul 30, 2024
d10ec20
Auto-generate API index page (#234)
lochhh Jul 30, 2024
01c3cf6
Load bboxes dataset from VIA tracks file (3/4) (#229)
sfmig Jul 31, 2024
8e3ab99
Refactor names and fix docs formatting in `validators` (#251)
lochhh Aug 1, 2024
2122591
Pin pandas version (& numpy) if python 3.12 (#259)
sfmig Aug 6, 2024
78b806e
Fix `tox requires` section (#261)
sfmig Aug 7, 2024
1f219cb
[pre-commit.ci] pre-commit autoupdate (#258)
pre-commit-ci[bot] Aug 7, 2024
8c45183
Adapt move accessor to bboxes datasets (#255)
sfmig Aug 7, 2024
e7ccfe5
Update setup docs (#264)
lochhh Aug 8, 2024
0cfded5
Revert "Pin pandas version (& numpy) if python 3.12 (#259)" (#272)
sfmig Aug 13, 2024
d3fac95
Configure intersphinx (#269)
lochhh Aug 14, 2024
a17e099
Suggestion to treat warnings as errors in sphinx-build (#256)
sfmig Aug 14, 2024
9ba4302
Refactor derivative (#270)
lochhh Aug 16, 2024
96c3cd7
Add utilities for vector magnitude and normalisation (#243)
niksirbi Aug 16, 2024
abeaff1
Simplify and expand filtering tests for bboxes (#267)
sfmig Aug 16, 2024
38246d9
Update test_and_deploy.yml (#275)
sfmig Aug 22, 2024
3ee5836
Extend tests for bboxes datasets (#246)
sfmig Aug 27, 2024
3df12a9
updated movement overview figure (#288)
niksirbi Aug 28, 2024
9612951
added new movement datasets figure, with caption (#286)
niksirbi Aug 29, 2024
f47d6e7
Refactor filtering test (#287)
sfmig Aug 29, 2024
a98ff45
[pre-commit.ci] pre-commit autoupdate (#296)
pre-commit-ci[bot] Sep 3, 2024
95965f8
Simplify and expand kinematic tests for bboxes (#265)
sfmig Sep 6, 2024
f4f46df
Fix xarray FutureWarning about dims vs sizes (#297)
niksirbi Sep 6, 2024
644c1b1
Add bbox centroid fix (#303)
sfmig Sep 13, 2024
9c80786
General validator function for checking dimensions and coordinates (#…
niksirbi Sep 17, 2024
a6dc15e
Compute Forward Vector (#276)
b-peri Oct 4, 2024
bfb20d2
[pre-commit.ci] pre-commit autoupdate (#318)
pre-commit-ci[bot] Oct 8, 2024
a42838d
Update integration tests (#295)
sfmig Oct 17, 2024
b399ce0
Fix command for installation of docs dependencies in the guide. (#323)
sfmig Oct 17, 2024
6c32608
Add example to convert file formats and changing keypoints (#304)
Lauraschwarz Oct 22, 2024
f7f3b48
Drop the `.move` accessor (#322)
niksirbi Oct 24, 2024
1b6b44d
removed "analysis" level from namespace (#333)
niksirbi Oct 24, 2024
7813e7c
Refactor auto-generate API docs (#331)
lochhh Oct 25, 2024
b10896f
Encourage R users to check out `animovement` (#335)
niksirbi Oct 29, 2024
536de0e
Compute pairwise distances (#278)
lochhh Oct 29, 2024
ca4daf2
[pre-commit.ci] pre-commit autoupdate (#338)
pre-commit-ci[bot] Nov 4, 2024
a3956c4
Implement `compute_speed` and `compute_path_length` (#280)
niksirbi Nov 5, 2024
5626ef3
multiview dataset fixture
vigji Nov 12, 2024
21fdd2a
First draft for function and tests
vigji May 30, 2024
087ba66
merging
vigji Nov 12, 2024
a669338
Merge remote-tracking branch 'origin/load-multiview' into load-multiview
vigji Nov 12, 2024
ab62209
still merging
vigji Nov 12, 2024
3d02d3e
renamed function
vigji Nov 20, 2024
8c6b213
fix tests
vigji Nov 20, 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
2 changes: 2 additions & 0 deletions .github/workflows/docs_build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
- uses: neuroinformatics-unit/actions/build_sphinx_docs@main
with:
python-version: 3.11
use-make: true

deploy_sphinx_docs:
name: Deploy Sphinx Docs
Expand All @@ -42,3 +43,4 @@ jobs:
- uses: neuroinformatics-unit/actions/deploy_sphinx_docs@main
with:
secret_input: ${{ secrets.GITHUB_TOKEN }}
use-make: true
10 changes: 5 additions & 5 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ jobs:
strategy:
matrix:
# Run all supported Python versions on linux
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]
os: [ubuntu-latest]
# Include 1 Intel macos (13) and 1 M1 macos (latest) and 1 Windows run
include:
- os: macos-13
python-version: "3.10"
python-version: "3.11"
- os: macos-latest
python-version: "3.10"
python-version: "3.11"
- os: windows-latest
python-version: "3.10"
python-version: "3.11"

steps:
- name: Cache Test Data
Expand All @@ -52,7 +52,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
auto-update-conda: true
channels: conda-forge
channels: conda-forge,nodefaults
activate-environment: movement-env
- uses: neuroinformatics-unit/actions/test@v2
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ instance/
docs/build/
docs/source/examples/
docs/source/api/
docs/source/api_index.rst
docs/source/snippets/admonitions.md
sg_execution_times.rst

# MkDocs documentation
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ci:
autoupdate_schedule: monthly
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-docstring-first
Expand All @@ -29,12 +29,12 @@ repos:
- id: rst-directive-colons
- id: rst-inline-touching-normal
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.3
rev: v0.7.2
hooks:
- id: ruff
- id: ruff-format
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.10.0
rev: v1.13.0
hooks:
- id: mypy
additional_dependencies:
Expand All @@ -45,14 +45,14 @@ repos:
- types-PyYAML
- types-requests
- repo: https://github.com/mgedmin/check-manifest
rev: "0.49"
rev: "0.50"
hooks:
- id: check-manifest
args: [--no-build-isolation]
additional_dependencies: [setuptools-scm]
- repo: https://github.com/codespell-project/codespell
# Configuration for codespell is in pyproject.toml
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell
additional_dependencies:
Expand Down
43 changes: 43 additions & 0 deletions CITATION.CFF
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
cff-version: 1.2.0
title: movement
message: >-
If you use movement in your work, please cite the following Zenodo DOI.
type: software
authors:
- given-names: Nikoloz
family-names: Sirmpilatze
orcid: 'https://orcid.org/0000-0003-1778-2427'
email: niko.sirbiladze@gmail.com
- given-names: Chang Huan
family-names: Lo
- given-names: Sofía
family-names: Miñano
- given-names: Brandon D.
family-names: Peri
- given-names: Dhruv
family-names: Sharma
- given-names: Laura
family-names: Porta
- given-names: Iván
family-names: Varela
- given-names: Adam L.
family-names: Tyson
email: code@adamltyson.com
identifiers:
- type: doi
value: 10.5281/zenodo.12755724
description: 'A collection of archived snapshots of movement on Zenodo.'
repository-code: 'https://github.com/neuroinformatics-unit/movement'
url: 'https://movement.neuroinformatics.dev/'
abstract: >-
Python tools for analysing body movements across space and time.
keywords:
- behavior
- behaviour
- kinematics
- neuroscience
- animal
- motion
- tracking
- pose
license: BSD-3-Clause
Loading
Loading