Merge branch 'develop' into feature/PYPE-1897_publishing-tvp-with-studio-rendering

openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py

@@ -104,7 +104,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
     families = ["render.farm", "prerender.farm",
                 "renderlayer", "imagesequence", "vrayscene"]
 
-    aov_filter = {"maya": [r".*(?:\.|_)*([Bb]eauty)(?:\.|_)*.*"],
+    aov_filter = {"maya": [r".*(?:[\._-])*([Bb]eauty)(?:[\.|_])*.*"],
                   "aftereffects": [r".*"],  # for everything from AE
                   "harmony": [r".*"],  # for everything from AE
                   "celaction": [r".*"]}
@@ -231,7 +231,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         args = [
             'publish',
             roothless_metadata_path,
-            "--targets {}".format("deadline")
+            "--targets", "deadline",
+            "--targets", "filesequence"
         ]
 
         # Generate the payload for Deadline submission

openpype/modules/default_modules/ftrack/plugins/publish/integrate_remove_components.py

@@ -1,30 +0,0 @@
-import pyblish.api
-import os
-
-
-class IntegrateCleanComponentData(pyblish.api.InstancePlugin):
-    """
-    Cleaning up thumbnail an mov files after they have been integrated
-    """
-
-    order = pyblish.api.IntegratorOrder + 0.5
-    label = 'Clean component data'
-    families = ["ftrack"]
-    optional = True
-    active = False
-
-    def process(self, instance):
-
-        for comp in instance.data['representations']:
-            self.log.debug('component {}'.format(comp))
-
-            if "%" in comp['published_path'] or "#" in comp['published_path']:
-                continue
-
-            if comp.get('thumbnail') or ("thumbnail" in comp.get('tags', [])):
-                os.remove(comp['published_path'])
-                self.log.info('Thumbnail image was erased')
-
-            elif comp.get('preview') or ("preview" in comp.get('tags', [])):
-                os.remove(comp['published_path'])
-                self.log.info('Preview mov file was erased')

openpype/modules/default_modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py

@@ -148,12 +148,27 @@ class OpenPypeContextSelector:
         for k, v in env.items():
             print("    {}: {}".format(k, v))
 
+        publishing_paths = [os.path.join(self.job.imageDir,
+                                         os.path.dirname(
+                                             self.job.imageFileName))]
+
+        # add additional channels
+        channel_idx = 0
+        channel = self.job.channelFileName(channel_idx)
+        while channel:
+            channel_path = os.path.dirname(
+                os.path.join(self.job.imageDir, channel))
+            if channel_path not in publishing_paths:
+                publishing_paths.append(channel_path)
+            channel_idx += 1
+            channel = self.job.channelFileName(channel_idx)
+
         args = [os.path.join(self.openpype_root, self.openpype_executable),
-                'publish', '-t', "rr_control", "--gui",
-                os.path.join(self.job.imageDir,
-                             os.path.dirname(self.job.imageFileName))
+                'publish', '-t', "rr_control", "--gui"
                 ]
 
+        args += publishing_paths
+
         print(">>> running {}".format(" ".join(args)))
         orig = os.environ.copy()
         orig.update(env)

openpype/modules/default_modules/sync_server/providers/sftp.py

@@ -192,7 +192,7 @@ class SFTPHandler(AbstractProvider):
             Format is importing for usage of python's format ** approach
         """
         # roots cannot be locally overridden
-        return self.presets['roots']
+        return self.presets['root']
 
     def get_tree(self):
         """