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

Jump to bottom

(0) Add camera group data structures #1258

Draft
wants to merge 43 commits into
base: develop
Choose a base branch
from
Draft

(0) Add camera group data structures #1258

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ad65e1f
Add camera group and calibration as attributes to `Video`
roomrys Apr 1, 2023
30707be
Add docs for calibration and camera group functions.
roomrys Apr 3, 2023
cd5c1c3
Add CameraCluster class
roomrys Apr 3, 2023
e34a028
Remove all calibration/camera-group related stuff from video class
roomrys Apr 3, 2023
c60d69e
Add initial Camcorder class and minimal tests
roomrys Apr 3, 2023
9bf2cff
Fix eq on Camcorder attrs to get tests working
roomrys Apr 4, 2023
c206944
Convert Camcorder to a wrapper class
roomrys Apr 4, 2023
e1fc405
Non-logical clean-up
roomrys Apr 4, 2023
57c0a90
Non-logical clean-up
roomrys Apr 4, 2023
3ac82de
Lint
roomrys Apr 4, 2023
12d8ae9
Merge branch 'develop' into liezl/add-camera-group
roomrys Apr 4, 2023
f6ef0cf
Remove camera attr from `Video`, fix test path, and clean-up
roomrys Apr 4, 2023
212fa4c
Remove unused imports
roomrys Apr 4, 2023
492a78b
Correct type-hinting `Camera` -> `Camcorder`
roomrys Apr 4, 2023
3f1b31d
Touch-up docstrings
roomrys Apr 4, 2023
21c3fb3
Merge branch 'develop' into liezl/add-camera-group
roomrys Apr 6, 2023
7951ae6
Merge branch 'develop' into liezl/add-camera-group
roomrys Apr 10, 2023
baa7420
Merge branch 'develop' into liezl/add-camera-group
roomrys Apr 11, 2023
fddc055
Merge branch 'develop' into liezl/add-camera-group
roomrys Apr 27, 2023
d456f29
Merge branch 'develop' into liezl/add-camera-group
roomrys Jul 6, 2023
7e2e185
Merge branch 'develop' into liezl/add-camera-group
roomrys Jul 6, 2023
39c74e2
Hack sleap-anipose into the requirements
roomrys Jul 7, 2023
b74ecfd
Merge branch 'liezl/add-camera-group' of https://github.com/talmolab/…
roomrys Jul 7, 2023
514e747
Fix typo in ci hack
roomrys Jul 7, 2023
aacdbd1
Perform install hack in same step as tests
roomrys Jul 7, 2023
afcbb15
Do a `pip uninstall` instead of `conda uninstall`
roomrys Jul 19, 2023
f76679a
OS specific uninstall commands in CI
roomrys Jul 19, 2023
9d70a86
Correct syntax for CI
roomrys Jul 19, 2023
5c0d532
Use `micromamba` instead of `conda`
roomrys Jul 19, 2023
8b29794
Use conda to install `imgaug`
roomrys Jul 19, 2023
90649c4
Use `pip freeze` to list `opencv`
roomrys Jul 19, 2023
4344118
Explicitly use xvfb in Linux tests
roomrys Jul 19, 2023
9fde0b6
Try to run tests using github actions xvfb
roomrys Jul 19, 2023
a1fc9a2
Separate pytest command from dependency changes
roomrys Jul 19, 2023
15cc927
Revert to using just pytest in CI
roomrys Jul 19, 2023
5dc74b2
Set environment variable in tests
roomrys Jul 19, 2023
fcc8c28
Add comments
roomrys Jul 19, 2023
587331f
Merge branch 'develop' of https://github.com/talmolab/sleap into liez…
Sep 25, 2023
168a10f
Sort imports
roomrys Sep 29, 2023
b8ac481
Add error message for accessing `Camcorder` attributes
roomrys Sep 29, 2023
cb3efea
Add error message for loading calibration file
roomrys Sep 29, 2023
d16516c
Change factory to default for initializing camera attribute
roomrys Sep 29, 2023
0230a97
Merge branch 'develop' of https://github.com/talmolab/sleap into liez…
roomrys Oct 19, 2023
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
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
powershell
post-cleanup: all

# Install correct version of opencv
# HACK(LM): Install correct version of opencv
- name: Reinstall opencv
shell: bash -l {0}
run: |
Expand All @@ -109,13 +109,11 @@ jobs:
micromamba list
pip freeze

# Test environment after performing hack to install correct version of opencv
# Test the code and the environment
- name: Test with pytest
uses: coactions/setup-xvfb@v1
with:
shell: bash -l {0}
run: |
pytest ${{ matrix.test_args }}
shell: bash -l {0}
run: |
pytest ${{ matrix.test_args }}

# Upload coverage
- name: Upload coverage
Expand Down
8 changes: 8 additions & 0 deletions tests/gui/test_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import os
import pytest
roomrys marked this conversation as resolved.
Show resolved Hide resolved

from qtpy.QtCore import QLibraryInfo
from qtpy.QtWidgets import QApplication

from sleap.gui.app import MainWindow
from sleap.gui.commands import *


os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = QLibraryInfo.location(
QLibraryInfo.PluginsPath
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find!

)


def test_app_workflow(
qtbot, centered_pair_vid, small_robot_mp4_vid, min_tracks_2node_labels: Labels
):
Expand Down