Merge pull request #2789 from pypeclub/feature/move_deadline_module

Deadline: Move module one hierarchy level higher
ynput · Feb 23, 2022 · e8b7e64 · e8b7e64
2 parents e179b1d + 25cd18f
commit e8b7e64
Show file tree

Hide file tree

Showing 30 changed files with 14 additions and 10 deletions.
diff --git a/openpype/modules/base.py b/openpype/modules/base.py
@@ -33,6 +33,7 @@
     "avalon_apps",
     "clockify",
     "log_viewer",
+    "deadline",
     "muster",
     "royal_render",
     "python_console_interpreter",

diff --git a/...ules/default_modules/deadline/__init__.py → openpype/modules/deadline/__init__.py b/...ules/default_modules/deadline/__init__.py → openpype/modules/deadline/__init__.py
diff --git a/openpype/lib/abstract_submit_deadline.py → ...ules/deadline/abstract_submit_deadline.py b/openpype/lib/abstract_submit_deadline.py → ...ules/deadline/abstract_submit_deadline.py
@@ -15,7 +15,7 @@
 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/...fault_modules/deadline/deadline_module.py → openpype/modules/deadline/deadline_module.py b/...fault_modules/deadline/deadline_module.py → openpype/modules/deadline/deadline_module.py
diff --git a/.../collect_deadline_server_from_instance.py → .../collect_deadline_server_from_instance.py b/.../collect_deadline_server_from_instance.py → .../collect_deadline_server_from_instance.py
diff --git a/...ublish/collect_default_deadline_server.py → ...ublish/collect_default_deadline_server.py b/...ublish/collect_default_deadline_server.py → ...ublish/collect_default_deadline_server.py
diff --git a/...s/publish/submit_aftereffects_deadline.py → ...s/publish/submit_aftereffects_deadline.py b/...s/publish/submit_aftereffects_deadline.py → ...s/publish/submit_aftereffects_deadline.py
@@ -5,9 +5,9 @@
 
 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/...lugins/publish/submit_harmony_deadline.py → ...lugins/publish/submit_harmony_deadline.py b/...lugins/publish/submit_harmony_deadline.py → ...lugins/publish/submit_harmony_deadline.py
@@ -8,11 +8,11 @@
 
 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 @@ def filter_data(a, v):
 
 
 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/.../publish/submit_houdini_remote_publish.py → .../publish/submit_houdini_remote_publish.py b/.../publish/submit_houdini_remote_publish.py → .../publish/submit_houdini_remote_publish.py
diff --git a/...publish/submit_houdini_render_deadline.py → ...publish/submit_houdini_render_deadline.py b/...publish/submit_houdini_render_deadline.py → ...publish/submit_houdini_render_deadline.py
diff --git a/...e/plugins/publish/submit_maya_deadline.py → ...e/plugins/publish/submit_maya_deadline.py b/...e/plugins/publish/submit_maya_deadline.py → ...e/plugins/publish/submit_maya_deadline.py
diff --git a/...e/plugins/publish/submit_nuke_deadline.py → ...e/plugins/publish/submit_nuke_deadline.py b/...e/plugins/publish/submit_nuke_deadline.py → ...e/plugins/publish/submit_nuke_deadline.py
diff --git a/...ine/plugins/publish/submit_publish_job.py → ...ine/plugins/publish/submit_publish_job.py b/...ine/plugins/publish/submit_publish_job.py → ...ine/plugins/publish/submit_publish_job.py
diff --git a/...s/publish/validate_deadline_connection.py → ...s/publish/validate_deadline_connection.py b/...s/publish/validate_deadline_connection.py → ...s/publish/validate_deadline_connection.py
diff --git a/...h/validate_expected_and_rendered_files.py → ...h/validate_expected_and_rendered_files.py b/...h/validate_expected_and_rendered_files.py → ...h/validate_expected_and_rendered_files.py
@@ -4,8 +4,8 @@
 
 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):

diff --git a/...adline/custom/plugins/GlobalJobPreLoad.py → ...sitory/custom/plugins/GlobalJobPreLoad.py b/...adline/custom/plugins/GlobalJobPreLoad.py → ...sitory/custom/plugins/GlobalJobPreLoad.py
diff --git a/...ugins/HarmonyOpenPype/HarmonyOpenPype.ico → ...ugins/HarmonyOpenPype/HarmonyOpenPype.ico b/...ugins/HarmonyOpenPype/HarmonyOpenPype.ico → ...ugins/HarmonyOpenPype/HarmonyOpenPype.ico
diff --git a/...s/HarmonyOpenPype/HarmonyOpenPype.options → ...s/HarmonyOpenPype/HarmonyOpenPype.options b/...s/HarmonyOpenPype/HarmonyOpenPype.options → ...s/HarmonyOpenPype/HarmonyOpenPype.options
diff --git a/...ins/HarmonyOpenPype/HarmonyOpenPype.param → ...ins/HarmonyOpenPype/HarmonyOpenPype.param b/...ins/HarmonyOpenPype/HarmonyOpenPype.param → ...ins/HarmonyOpenPype/HarmonyOpenPype.param
diff --git a/...lugins/HarmonyOpenPype/HarmonyOpenPype.py → ...lugins/HarmonyOpenPype/HarmonyOpenPype.py b/...lugins/HarmonyOpenPype/HarmonyOpenPype.py → ...lugins/HarmonyOpenPype/HarmonyOpenPype.py
diff --git a/...line/custom/plugins/OpenPype/OpenPype.ico → ...tory/custom/plugins/OpenPype/OpenPype.ico b/...line/custom/plugins/OpenPype/OpenPype.ico → ...tory/custom/plugins/OpenPype/OpenPype.ico
diff --git a/.../custom/plugins/OpenPype/OpenPype.options → .../custom/plugins/OpenPype/OpenPype.options b/.../custom/plugins/OpenPype/OpenPype.options → .../custom/plugins/OpenPype/OpenPype.options
diff --git a/...ne/custom/plugins/OpenPype/OpenPype.param → ...ry/custom/plugins/OpenPype/OpenPype.param b/...ne/custom/plugins/OpenPype/OpenPype.param → ...ry/custom/plugins/OpenPype/OpenPype.param
diff --git a/...dline/custom/plugins/OpenPype/OpenPype.py → ...itory/custom/plugins/OpenPype/OpenPype.py b/...dline/custom/plugins/OpenPype/OpenPype.py → ...itory/custom/plugins/OpenPype/OpenPype.py
diff --git a/...peTileAssembler/OpenPypeTileAssembler.ico → ...peTileAssembler/OpenPypeTileAssembler.ico b/...peTileAssembler/OpenPypeTileAssembler.ico → ...peTileAssembler/OpenPypeTileAssembler.ico
diff --git a/...leAssembler/OpenPypeTileAssembler.options → ...leAssembler/OpenPypeTileAssembler.options b/...leAssembler/OpenPypeTileAssembler.options → ...leAssembler/OpenPypeTileAssembler.options
diff --git a/...TileAssembler/OpenPypeTileAssembler.param → ...TileAssembler/OpenPypeTileAssembler.param b/...TileAssembler/OpenPypeTileAssembler.param → ...TileAssembler/OpenPypeTileAssembler.param
diff --git a/...ypeTileAssembler/OpenPypeTileAssembler.py → ...ypeTileAssembler/OpenPypeTileAssembler.py b/...ypeTileAssembler/OpenPypeTileAssembler.py → ...ypeTileAssembler/OpenPypeTileAssembler.py
diff --git a/vendor/deadline/readme.md → ...ype/modules/deadline/repository/readme.md b/vendor/deadline/readme.md → ...ype/modules/deadline/repository/readme.md
diff --git 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