From e82654392394b77f008c0521840afb12d6546edf Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 22 Feb 2022 14:53:06 +0100 Subject: [PATCH 1/3] moved deadline module one hierarchy level higher --- openpype/modules/base.py | 1 + openpype/modules/{default_modules => }/deadline/__init__.py | 0 .../modules/{default_modules => }/deadline/deadline_module.py | 0 .../plugins/publish/collect_deadline_server_from_instance.py | 0 .../deadline/plugins/publish/collect_default_deadline_server.py | 0 .../deadline/plugins/publish/submit_aftereffects_deadline.py | 0 .../deadline/plugins/publish/submit_harmony_deadline.py | 0 .../deadline/plugins/publish/submit_houdini_remote_publish.py | 0 .../deadline/plugins/publish/submit_houdini_render_deadline.py | 0 .../deadline/plugins/publish/submit_maya_deadline.py | 0 .../deadline/plugins/publish/submit_nuke_deadline.py | 0 .../deadline/plugins/publish/submit_publish_job.py | 0 .../deadline/plugins/publish/validate_deadline_connection.py | 0 .../plugins/publish/validate_expected_and_rendered_files.py | 0 14 files changed, 1 insertion(+) rename openpype/modules/{default_modules => }/deadline/__init__.py (100%) rename openpype/modules/{default_modules => }/deadline/deadline_module.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/collect_deadline_server_from_instance.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/collect_default_deadline_server.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/submit_aftereffects_deadline.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/submit_harmony_deadline.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/submit_houdini_remote_publish.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/submit_houdini_render_deadline.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/submit_maya_deadline.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/submit_nuke_deadline.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/submit_publish_job.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/validate_deadline_connection.py (100%) rename openpype/modules/{default_modules => }/deadline/plugins/publish/validate_expected_and_rendered_files.py (100%) diff --git a/openpype/modules/base.py b/openpype/modules/base.py index d566692439..07589fff18 100644 --- a/openpype/modules/base.py +++ b/openpype/modules/base.py @@ -33,6 +33,7 @@ DEFAULT_OPENPYPE_MODULES = ( "avalon_apps", "clockify", "log_viewer", + "deadline", "muster", "python_console_interpreter", "slack", diff --git a/openpype/modules/default_modules/deadline/__init__.py b/openpype/modules/deadline/__init__.py similarity index 100% rename from openpype/modules/default_modules/deadline/__init__.py rename to openpype/modules/deadline/__init__.py diff --git a/openpype/modules/default_modules/deadline/deadline_module.py b/openpype/modules/deadline/deadline_module.py similarity index 100% rename from openpype/modules/default_modules/deadline/deadline_module.py rename to openpype/modules/deadline/deadline_module.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/collect_deadline_server_from_instance.py rename to openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/collect_default_deadline_server.py b/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/collect_default_deadline_server.py rename to openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/submit_aftereffects_deadline.py rename to openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_harmony_deadline.py b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/submit_harmony_deadline.py rename to openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_remote_publish.py b/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_remote_publish.py rename to openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_render_deadline.py rename to openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/submit_maya_deadline.py rename to openpype/modules/deadline/plugins/publish/submit_maya_deadline.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/submit_nuke_deadline.py rename to openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py rename to openpype/modules/deadline/plugins/publish/submit_publish_job.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/validate_deadline_connection.py b/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/validate_deadline_connection.py rename to openpype/modules/deadline/plugins/publish/validate_deadline_connection.py diff --git a/openpype/modules/default_modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py similarity index 100% rename from openpype/modules/default_modules/deadline/plugins/publish/validate_expected_and_rendered_files.py rename to openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py From 36420b53408c7caa0b751bd174cfc139d25f8280 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 22 Feb 2022 16:15:46 +0100 Subject: [PATCH 2/3] moved deadline repository files from vendor to deadline module --- .../repository}/custom/plugins/GlobalJobPreLoad.py | 0 .../plugins/HarmonyOpenPype/HarmonyOpenPype.ico | Bin .../plugins/HarmonyOpenPype/HarmonyOpenPype.options | 0 .../plugins/HarmonyOpenPype/HarmonyOpenPype.param | 0 .../plugins/HarmonyOpenPype/HarmonyOpenPype.py | 0 .../custom/plugins/OpenPype/OpenPype.ico | Bin .../custom/plugins/OpenPype/OpenPype.options | 0 .../custom/plugins/OpenPype/OpenPype.param | 0 .../repository}/custom/plugins/OpenPype/OpenPype.py | 0 .../OpenPypeTileAssembler/OpenPypeTileAssembler.ico | Bin .../OpenPypeTileAssembler.options | 0 .../OpenPypeTileAssembler.param | 0 .../OpenPypeTileAssembler/OpenPypeTileAssembler.py | 0 .../modules/deadline/repository}/readme.md | 0 website/docs/module_deadline.md | 2 +- 15 files changed, 1 insertion(+), 1 deletion(-) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/GlobalJobPreLoad.py (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.ico (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.options (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.param (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPype/OpenPype.ico (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPype/OpenPype.options (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPype/OpenPype.param (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPype/OpenPype.py (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py (100%) rename {vendor/deadline => openpype/modules/deadline/repository}/readme.md (100%) diff --git a/vendor/deadline/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py similarity index 100% rename from vendor/deadline/custom/plugins/GlobalJobPreLoad.py rename to openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py diff --git a/vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.ico b/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.ico similarity index 100% rename from vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.ico rename to openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.ico diff --git a/vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.options b/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.options similarity index 100% rename from vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.options rename to openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.options diff --git a/vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.param b/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.param similarity index 100% rename from vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.param rename to openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.param diff --git a/vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py b/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py similarity index 100% rename from vendor/deadline/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py rename to openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py diff --git a/vendor/deadline/custom/plugins/OpenPype/OpenPype.ico b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.ico similarity index 100% rename from vendor/deadline/custom/plugins/OpenPype/OpenPype.ico rename to openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.ico diff --git a/vendor/deadline/custom/plugins/OpenPype/OpenPype.options b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.options similarity index 100% rename from vendor/deadline/custom/plugins/OpenPype/OpenPype.options rename to openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.options diff --git a/vendor/deadline/custom/plugins/OpenPype/OpenPype.param b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.param similarity index 100% rename from vendor/deadline/custom/plugins/OpenPype/OpenPype.param rename to openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.param diff --git a/vendor/deadline/custom/plugins/OpenPype/OpenPype.py b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py similarity index 100% rename from vendor/deadline/custom/plugins/OpenPype/OpenPype.py rename to openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py diff --git a/vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico similarity index 100% rename from vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico rename to openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico diff --git a/vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options similarity index 100% rename from vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options rename to openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options diff --git a/vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param similarity index 100% rename from vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param rename to openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param diff --git a/vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py similarity index 100% rename from vendor/deadline/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py rename to openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py diff --git a/vendor/deadline/readme.md b/openpype/modules/deadline/repository/readme.md similarity index 100% rename from vendor/deadline/readme.md rename to openpype/modules/deadline/repository/readme.md diff --git a/website/docs/module_deadline.md b/website/docs/module_deadline.md index 32dbcfa6df..6b39f0780a 100644 --- a/website/docs/module_deadline.md +++ b/website/docs/module_deadline.md @@ -20,7 +20,7 @@ For [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) support you ne 4. Point OpenPype to your deadline webservice URL in the [OpenPype Admin Settings](admin_settings_system.md#deadline). -5. Install our custom plugin and scripts to your deadline repository. It should be as simple as copying content of `openPype/vendor/deadline/custom` to `path/to/your/deadline/repository/custom`. +5. Install our custom plugin and scripts to your deadline repository. It should be as simple as copying content of `openpype/modules/deadline/repository/custom` to `path/to/your/deadline/repository/custom`. ## Configuration From 25cd18f2c6a0257757a4bb23ac89b549b4bb3c3f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 22 Feb 2022 17:11:17 +0100 Subject: [PATCH 3/3] moved abstract_submit_deadline to deadline module --- .../deadline}/abstract_submit_deadline.py | 2 +- .../plugins/publish/submit_aftereffects_deadline.py | 8 +++++--- .../deadline/plugins/publish/submit_harmony_deadline.py | 9 +++++---- .../publish/validate_expected_and_rendered_files.py | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) rename openpype/{lib => modules/deadline}/abstract_submit_deadline.py (99%) diff --git a/openpype/lib/abstract_submit_deadline.py b/openpype/modules/deadline/abstract_submit_deadline.py similarity index 99% rename from openpype/lib/abstract_submit_deadline.py rename to openpype/modules/deadline/abstract_submit_deadline.py index f54a2501a3..22902d79ea 100644 --- a/openpype/lib/abstract_submit_deadline.py +++ b/openpype/modules/deadline/abstract_submit_deadline.py @@ -15,7 +15,7 @@ import attr import requests import pyblish.api -from .abstract_metaplugins import AbstractMetaInstancePlugin +from openpype.lib.abstract_metaplugins import AbstractMetaInstancePlugin def requests_post(*args, **kwargs): diff --git a/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py index 1fff55500e..2918b54d4a 100644 --- a/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py @@ -5,9 +5,9 @@ import pyblish.api from avalon import api -from openpype.lib import abstract_submit_deadline -from openpype.lib.abstract_submit_deadline import DeadlineJobInfo from openpype.lib import env_value_to_bool +from openpype_modules.deadline import abstract_submit_deadline +from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo @attr.s @@ -24,7 +24,9 @@ class DeadlinePluginInfo(): MultiProcess = attr.ib(default=None) -class AfterEffectsSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): +class AfterEffectsSubmitDeadline( + abstract_submit_deadline.AbstractSubmitDeadline +): label = "Submit AE to Deadline" order = pyblish.api.IntegratorOrder + 0.1 diff --git a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py index 9d55d43ba6..918efb6630 100644 --- a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py @@ -8,11 +8,11 @@ import re import attr import pyblish.api - -import openpype.lib.abstract_submit_deadline -from openpype.lib.abstract_submit_deadline import DeadlineJobInfo from avalon import api +from openpype_modules.deadline import abstract_submit_deadline +from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo + class _ZipFile(ZipFile): """Extended check for windows invalid characters.""" @@ -217,7 +217,8 @@ class PluginInfo(object): class HarmonySubmitDeadline( - openpype.lib.abstract_submit_deadline.AbstractSubmitDeadline): + abstract_submit_deadline.AbstractSubmitDeadline +): """Submit render write of Harmony scene to Deadline. Renders are submitted to a Deadline Web Service as diff --git a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py index 719c7dfe3e..615ba53c1a 100644 --- a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py +++ b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py @@ -4,8 +4,8 @@ import requests import pyblish.api -from openpype.lib.abstract_submit_deadline import requests_get from openpype.lib.delivery import collect_frames +from openpype_modules.deadline.abstract_submit_deadline import requests_get class ValidateExpectedFiles(pyblish.api.InstancePlugin):