fixed conflicts

pype/plugins/global/load/open_djv.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
 import json
-from pypeapp import config
+from pype.api import config
 from avalon import api
 
 

pype/plugins/global/publish/cleanup.py

@@ -46,8 +46,14 @@ class CleanUp(pyblish.api.InstancePlugin):
             if (result["error"] is not None and result["instance"] is not None
                and result["instance"] not in failed):
                 failed.append(result["instance"])
-        assert instance not in failed, ("Result of '{}' instance "
-            "were not success".format(instance.data["name"]))
+        assert instance not in failed, (
+            "Result of '{}' instance were not success".format(
+                instance.data["name"]
+            )
+        )
+
+        self.log.info("Cleaning renders ...")
+        clean_renders(instance)
 
         if [ef for ef in self.exclude_families
                 if instance.data["family"] in ef]:
@@ -65,7 +71,5 @@ class CleanUp(pyblish.api.InstancePlugin):
                           "temp folder: %s" % staging_dir)
             return
 
-        self.log.info("Removing temporary folder ...")
+        self.log.info("Removing staging directory ...")
         shutil.rmtree(staging_dir)
-        self.log.info("Cleaning renders ...")
-        clean_renders(instance)

pype/plugins/global/publish/collect_anatomy_object.py

@@ -4,10 +4,10 @@ Requires:
     os.environ -> AVALON_PROJECT
 
 Provides:
-    context -> anatomy (pypeapp.Anatomy)
+    context -> anatomy (pype.api.Anatomy)
 """
 import os
-from pypeapp import Anatomy
+from pype.api import Anatomy
 import pyblish.api
 
 

pype/plugins/global/publish/collect_datetime_data.py

@@ -5,7 +5,7 @@ Provides:
 """
 
 import pyblish.api
-from pypeapp import config
+from pype.api import config
 
 
 class CollectDateTimeData(pyblish.api.ContextPlugin):

pype/plugins/global/publish/collect_output_repre_config.py

@@ -7,7 +7,7 @@ Provides:
 """
 
 import pyblish.api
-from pypeapp import config
+from pype.api import config
 
 
 class CollectOutputRepreConfig(pyblish.api.ContextPlugin):

pype/plugins/global/publish/collect_presets.py

@@ -8,7 +8,7 @@ Provides:
 """
 
 from pyblish import api
-from pypeapp import config
+from pype.api import config
 
 
 class CollectPresets(api.ContextPlugin):

pype/plugins/global/publish/extract_burnin.py

@@ -58,7 +58,7 @@ class ExtractBurnin(pype.api.Extractor):
         if "representations" not in instance.data:
             raise RuntimeError("Burnin needs already created mov to work on.")
 
-        if self.profiles is None:
+        if self.use_legacy_code(instance):
             return self.legacy_process(instance)
         self.main_process(instance)
 
@@ -71,6 +71,12 @@ class ExtractBurnin(pype.api.Extractor):
 
         self.log.debug(instance.data["representations"])
 
+    def use_legacy_code(self, instance):
+        presets = instance.context.data.get("presets")
+        if presets is None and self.profiles is None:
+            return True
+        return "burnins" in (presets.get("tools") or {})
+
     def main_process(self, instance):
         # TODO get these data from context
         host_name = os.environ["AVALON_APP"]
@@ -830,7 +836,7 @@ class ExtractBurnin(pype.api.Extractor):
         for i, repre in enumerate(instance.data["representations"]):
             self.log.debug("__ i: `{}`, repre: `{}`".format(i, repre))
 
-            if "multipartExr" in repre.get("tags", []):
+            if instance.data.get("multipartExr") is True:
                 # ffmpeg doesn't support multipart exrs
                 continue
 

pype/plugins/global/publish/extract_jpeg.py

@@ -36,7 +36,7 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin):
             if not isinstance(repre['files'], list):
                 continue
 
-            if "multipartExr" in tags:
+            if instance.data.get("multipartExr") is True:
                 # ffmpeg doesn't support multipart exrs
                 continue
 

pype/plugins/global/publish/extract_review.py

@@ -22,7 +22,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
     label = "Extract Review"
     order = pyblish.api.ExtractorOrder + 0.02
     families = ["review"]
-    hosts = ["nuke", "maya", "shell", "nukestudio", "premiere"]
+    hosts = ["nuke", "maya", "shell", "nukestudio", "premiere", "harmony"]
 
     # Supported extensions
     image_exts = ["exr", "jpg", "jpeg", "png", "dpx"]
@@ -1131,7 +1131,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
 
             tags = repre.get("tags", [])
 
-            if instance.data.get("multipartExr") is True:
+            if inst_data.get("multipartExr") is True:
                 # ffmpeg doesn't support multipart exrs
                 continue
 

pype/plugins/global/publish/integrate_new.py

@@ -9,7 +9,7 @@ import six
 
 from pymongo import DeleteOne, InsertOne
 import pyblish.api
-from avalon import api, io
+from avalon import io
 from avalon.vendor import filelink
 
 # this is needed until speedcopy for linux is fixed
@@ -44,6 +44,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         "frameStart"
         "frameEnd"
         'fps'
+        "data": additional metadata for each representation.
     """
 
     label = "Integrate Asset New"
@@ -81,7 +82,8 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 "assembly",
                 "fbx",
                 "textures",
-                "action"
+                "action",
+                "harmony.template"
                 ]
     exclude_families = ["clip"]
     db_representation_context_keys = [
@@ -375,9 +377,10 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                         index_frame_start += 1
 
                     dst = "{0}{1}{2}".format(
-                            dst_head,
-                            dst_padding,
-                            dst_tail).replace("..", ".")
+                        dst_head,
+                        dst_padding,
+                        dst_tail
+                    ).replace("..", ".")
 
                     self.log.debug("destination: `{}`".format(dst))
                     src = os.path.join(stagingdir, src_file_name)
@@ -450,13 +453,15 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
             if repre_id is None:
                 repre_id = io.ObjectId()
 
+            data = repre.get("data") or {}
+            data.update({'path': dst, 'template': template})
             representation = {
                 "_id": repre_id,
                 "schema": "pype:representation-2.0",
                 "type": "representation",
                 "parent": version_id,
                 "name": repre['name'],
-                "data": {'path': dst, 'template': template},
+                "data": data,
                 "dependencies": instance.data.get("dependencies", "").split(),
 
                 # Imprint shortcut to context

pype/plugins/global/publish/validate_version.py

@@ -17,9 +17,9 @@ class ValidateVersion(pyblish.api.InstancePlugin):
         latest_version = instance.data.get("latestVersion")
 
         if latest_version is not None:
-            msg = ("Version `{0}` that you are"
-                   " trying to publish, already"
-                   " exists in the"
-                   " database.").format(
-                   version, latest_version)
+            msg = (
+                "Version `{0}` that you are trying to publish, already exists"
+                " in the database. Version in database: `{1}`. Please version "
+                "up your workfile to a higher version number than: `{1}`."
+            ).format(version, latest_version)
             assert (int(version) > int(latest_version)), msg