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

Use artifact downloads instead of submodules #2

Merged
merged 28 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f989feb
Update submodules. Fix DM bugs in test_basic.py
aliddell Apr 28, 2023
5d170dd
Merge branch 'main' into submodule-updates
aliddell May 3, 2023
5b317b9
Update acquire-driver-common and acquire-driver-hdcam. Restore recurs…
aliddell May 3, 2023
1d79e24
Restore capital-T Tiff.
aliddell May 3, 2023
34647a7
Try to enable long paths in CI.
aliddell May 3, 2023
d68d40f
Try again to enable long paths in CI.
aliddell May 3, 2023
5fcd566
Update typing and dcam tests
aliddell May 4, 2023
941027c
Update acquire-driver-common and acquire-video-runtime submodules
aliddell May 4, 2023
20ea3a0
update acquire-driver-zarr submodule.
aliddell May 4, 2023
b5bf4f9
update deps, tests
nclack May 5, 2023
9cd2915
testing (wip)
nclack May 5, 2023
6e41aff
fix trigger assignment
nclack May 8, 2023
7b3180f
update submodules
aliddell May 8, 2023
8e08001
wip
aliddell May 8, 2023
a887683
update build and test yamls
aliddell May 8, 2023
afba01d
fix packaging
nclack May 8, 2023
bc54ff2
packaging: remove old setuptools options
nclack May 8, 2023
b07cbb3
get dcam test to pass
nclack May 9, 2023
0b27539
fix packaging
nclack May 8, 2023
e4b9e01
build and test passes
aliddell May 9, 2023
3cc7cdd
remove driver submodules
aliddell May 9, 2023
652c401
update dcam and egrabber test yamls
aliddell May 9, 2023
df82566
Merge remote-tracking branch 'nclack/testing' into submodule-updates
aliddell May 9, 2023
a88e12a
add GH token to environment variables in typing test.
aliddell May 9, 2023
5a256f7
Clean up build script
aliddell May 9, 2023
750f6f6
Address PR comments.
aliddell May 10, 2023
28f46f6
update zarr sha
nclack May 10, 2023
d87ea2d
update shas
nclack May 10, 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
6 changes: 3 additions & 3 deletions tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def test_set_storage(runtime: Runtime):
assert p.video[0].storage.identifier is not None
assert p.video[0].storage.identifier.kind == acquire.DeviceKind.NONE
p.video[0].storage.identifier = dm.select(
acquire.DeviceKind.Storage, "Tiff"
acquire.DeviceKind.Storage, "tiff"
)
assert p.video[0].storage.identifier is not None

Expand Down Expand Up @@ -207,7 +207,7 @@ def test_change_filename(runtime: Runtime):
dm = runtime.device_manager()
p = runtime.get_configuration()
p.video[0].camera.identifier = dm.select(DeviceKind.Camera, "simulated.*")
p.video[0].storage.identifier = dm.select(DeviceKind.Storage, "Tiff")
p.video[0].storage.identifier = dm.select(DeviceKind.Storage, "tiff")
p.video[0].max_frame_count = 1

names = [
Expand Down Expand Up @@ -240,7 +240,7 @@ def test_write_external_metadata_to_tiff(
DeviceKind.Camera, "simulated.*sin"
)
p.video[0].camera.settings.shape = (33, 47)
p.video[0].storage.identifier = dm.select(DeviceKind.Storage, "Tiff")
p.video[0].storage.identifier = dm.select(DeviceKind.Storage, "tiff")
p.video[0].max_frame_count = 3
p.video[0].storage.settings.filename = f"{request.node.name}.tif"
metadata = {"hello": "world"}
Expand Down