Merge pull request #2789 from pypeclub/feature/move_deadline_module

Deadline: Move module one hierarchy level higher

openpype/modules/base.py

@@ -33,6 +33,7 @@ DEFAULT_OPENPYPE_MODULES = (
     "avalon_apps",
     "clockify",
     "log_viewer",
+    "deadline",
     "muster",
     "royal_render",
     "python_console_interpreter",

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):

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

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

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):

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