Merge remote-tracking branch 'upstream/develop' into deadline_validate_expected_files

.gitmodules

@@ -4,9 +4,3 @@
 [submodule "repos/avalon-unreal-integration"]
 	path = repos/avalon-unreal-integration
 	url = https://github.com/pypeclub/avalon-unreal-integration.git
-[submodule "openpype/modules/default_modules/ftrack/python2_vendor/arrow"]
-	path = openpype/modules/default_modules/ftrack/python2_vendor/arrow
-	url = https://github.com/arrow-py/arrow.git
-[submodule "openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api"]
-	path = openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api
-	url = https://bitbucket.org/ftrack/ftrack-python-api.git

openpype/lib/terminal.py

@@ -49,11 +49,13 @@ class Terminal:
         """
 
         from openpype.lib import env_value_to_bool
-        use_colors = env_value_to_bool(
+        log_no_colors = env_value_to_bool(
-            "OPENPYPE_LOG_NO_COLORS", default=Terminal.use_colors
+            "OPENPYPE_LOG_NO_COLORS", default=None
         )
-        if not use_colors:
+        if log_no_colors is not None:
-            Terminal.use_colors = use_colors
+            Terminal.use_colors = not log_no_colors
+
+        if not Terminal.use_colors:
             Terminal._initialized = True
             return
 

openpype/modules/base.py

@@ -33,8 +33,11 @@ DEFAULT_OPENPYPE_MODULES = (
     "avalon_apps",
     "clockify",
     "log_viewer",
+    "deadline",
     "muster",
+    "royal_render",
     "python_console_interpreter",
+    "ftrack",
     "slack",
     "webserver",
     "launcher_action",
@@ -219,8 +222,6 @@ def load_interfaces(force=False):
 
 def _load_interfaces():
     # Key under which will be modules imported in `sys.modules`
-    from openpype.lib import import_filepath
-
     modules_key = "openpype_interfaces"
 
     sys.modules[modules_key] = openpype_interfaces = (

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

openpype/modules/default_modules/ftrack/python2_vendor/arrow

@@ -1 +0,0 @@
-Subproject commit b746fedf7286c3755a46f07ab72f4c414cd41fc0

openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api

@@ -1 +0,0 @@
-Subproject commit d277f474ab016e7b53479c36af87cb861d0cc53e