From 5f1aa49790669c02f49ea797d5a066d865687260 Mon Sep 17 00:00:00 2001 From: Jonathan Takahashi Date: Wed, 13 Nov 2024 14:23:46 -0500 Subject: [PATCH 1/7] Update tator-py submodule --- scripts/packages/tator-py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packages/tator-py b/scripts/packages/tator-py index 4291158ad..fcd3da9a6 160000 --- a/scripts/packages/tator-py +++ b/scripts/packages/tator-py @@ -1 +1 @@ -Subproject commit 4291158adb668f5275ff397914fd1517fe838573 +Subproject commit fcd3da9a60e0132ee11eef9daff3d8ec4cf56a1b From a663afff7580dcd343b1c503a281f368f2e075d1 Mon Sep 17 00:00:00 2001 From: Jonathan Takahashi Date: Wed, 13 Nov 2024 14:34:46 -0500 Subject: [PATCH 2/7] Update tator-py submodule --- scripts/packages/tator-py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packages/tator-py b/scripts/packages/tator-py index fcd3da9a6..8591a1174 160000 --- a/scripts/packages/tator-py +++ b/scripts/packages/tator-py @@ -1 +1 @@ -Subproject commit fcd3da9a60e0132ee11eef9daff3d8ec4cf56a1b +Subproject commit 8591a117449822d6ab60984efbc12f155a683a3e From a47d4f88c3b0e956a64f8f4ba758c2fe3c2c024e Mon Sep 17 00:00:00 2001 From: Jonathan Takahashi Date: Wed, 13 Nov 2024 14:42:07 -0500 Subject: [PATCH 3/7] Update tator-py submodule --- scripts/packages/tator-py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packages/tator-py b/scripts/packages/tator-py index 8591a1174..c1952bfe7 160000 --- a/scripts/packages/tator-py +++ b/scripts/packages/tator-py @@ -1 +1 @@ -Subproject commit 8591a117449822d6ab60984efbc12f155a683a3e +Subproject commit c1952bfe7c3edfc9f7d7b6d0d6db80b8be75ed21 From 87caf7dc3744b2bc98b8419b4f16aa399e17b76c Mon Sep 17 00:00:00 2001 From: Jonathan Takahashi Date: Wed, 13 Nov 2024 14:59:16 -0500 Subject: [PATCH 4/7] Update tator-py submodule --- scripts/packages/tator-py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packages/tator-py b/scripts/packages/tator-py index c1952bfe7..1b36cabcb 160000 --- a/scripts/packages/tator-py +++ b/scripts/packages/tator-py @@ -1 +1 @@ -Subproject commit c1952bfe7c3edfc9f7d7b6d0d6db80b8be75ed21 +Subproject commit 1b36cabcb836873566387bbedfa890a0655fc72a From deabf9c318b48f3c4e376eb1f761e83a2551eecc Mon Sep 17 00:00:00 2001 From: Jonathan Takahashi Date: Thu, 14 Nov 2024 07:40:30 -0500 Subject: [PATCH 5/7] Call `update_media` in frontend test setup --- test/_common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/_common.py b/test/_common.py index 24e52d9d3..40c2192ef 100644 --- a/test/_common.py +++ b/test/_common.py @@ -5,7 +5,7 @@ import tator from tator.util._upload_file import _upload_file -from tator.transcode.determine_transcode import determine_transcode +from tator.transcode.determine_transcode import update_media from tator.transcode.make_thumbnails import make_thumbnail_image, make_thumbnail_gif from tator.transcode.transcode import make_video_definition @@ -35,7 +35,7 @@ def create_media(api, project, host, token, type_id, fname, section, media_path) media_id = response.id[0] # Needed to update media level info - determine_transcode(host, token, type_id, media_id, media_path, 1080) + update_media(host, token, type_id, media_id, media_path) with tempfile.TemporaryDirectory() as td: try: From da8c4e7942d14e0d8cd3adb6c07e4a58080fba97 Mon Sep 17 00:00:00 2001 From: Jonathan Takahashi Date: Thu, 14 Nov 2024 15:51:25 +0000 Subject: [PATCH 6/7] Update hosted template test to use busybox instead of whalesay (which cannot be pulled for some reason) --- doc/examples/workflow_template/echo.yaml | 8 ++++---- scripts/packages/tator-py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/examples/workflow_template/echo.yaml b/doc/examples/workflow_template/echo.yaml index 8c506ff45..8e45af0e0 100644 --- a/doc/examples/workflow_template/echo.yaml +++ b/doc/examples/workflow_template/echo.yaml @@ -3,12 +3,12 @@ kind: Workflow # new type of k8s spec metadata: generateName: echo- # name of the workflow spec spec: - entrypoint: whalesay # invoke the whalesay template + entrypoint: echo # invoke the whalesay template templates: - - name: whalesay # name of the template + - name: echo # name of the template container: - image: docker/whalesay - command: [ cowsay ] + image: busybox + command: [ echo ] args: [ "{{ message }}" ] resources: # limit the resources limits: diff --git a/scripts/packages/tator-py b/scripts/packages/tator-py index 1b36cabcb..f564f3de2 160000 --- a/scripts/packages/tator-py +++ b/scripts/packages/tator-py @@ -1 +1 @@ -Subproject commit 1b36cabcb836873566387bbedfa890a0655fc72a +Subproject commit f564f3de2f817469dbc38e5fb09c8fb975a03448 From 28d8bbd5e91a6d75dffeee33f9b839d62a9b52ea Mon Sep 17 00:00:00 2001 From: Jonathan Takahashi Date: Thu, 14 Nov 2024 18:34:51 +0000 Subject: [PATCH 7/7] Update tator-py submodule --- scripts/packages/tator-py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packages/tator-py b/scripts/packages/tator-py index f564f3de2..7d5d58524 160000 --- a/scripts/packages/tator-py +++ b/scripts/packages/tator-py @@ -1 +1 @@ -Subproject commit f564f3de2f817469dbc38e5fb09c8fb975a03448 +Subproject commit 7d5d58524bcc7e556eeb5e8f95b93434742870cf