Merge branch 'master' into develop

pype/ftrack/events/event_sync_to_avalon.py

@@ -1643,7 +1643,7 @@ class SyncToAvalonEvent(BaseEvent):
                     new_name, "task", schema_patterns=self.regex_schemas
                 )
                 if not passed_regex:
-                    self.regex_failed.append(ent_infos["entityId"])
+                    self.regex_failed.append(ent_info["entityId"])
                     continue
 
                 if new_name not in self.task_changes_by_avalon_id[mongo_id]:

pype/nuke/lib.py

@@ -196,7 +196,7 @@ def format_anatomy(data):
         "root": api.Session["AVALON_PROJECTS"],
         "subset": data["avalon"]["subset"],
         "asset": data["avalon"]["asset"],
-        "task": api.Session["AVALON_TASK"].lower(),
+        "task": api.Session["AVALON_TASK"],
         "family": data["avalon"]["family"],
         "project": {"name": project_document["name"],
                     "code": project_document["data"].get("code", '')},
@@ -1070,7 +1070,7 @@ class BuildWorkfile(WorkfileSettings):
             "project": {"name": self._project["name"],
                         "code": self._project["data"].get("code", '')},
             "asset": self._asset or os.environ["AVALON_ASSET"],
-            "task": kwargs.get("task") or api.Session["AVALON_TASK"].lower(),
+            "task": kwargs.get("task") or api.Session["AVALON_TASK"],
             "hierarchy": kwargs.get("hierarchy") or pype.get_hierarchy(),
             "version": kwargs.get("version", {}).get("name", 1),
             "user": getpass.getuser(),

pype/plugins/nuke/create/create_backdrop.py

@@ -2,6 +2,7 @@ from avalon.nuke.pipeline import Creator
 from avalon.nuke import lib as anlib
 import nuke
 
+
 class CreateBackdrop(Creator):
     """Add Publishable Backdrop"""
 
@@ -35,8 +36,8 @@ class CreateBackdrop(Creator):
 
                 return instance
             else:
-                msg = "Please select nodes you "
-                      "wish to add to a container"
+                msg = str("Please select nodes you "
+                          "wish to add to a container")
                 self.log.error(msg)
                 nuke.message(msg)
                 return

pype/plugins/nuke/load/load_backdrop.py

@@ -240,77 +240,6 @@ class LoadBackdropNodes(api.Loader):
 
         return update_container(GN, data_imprint)
 
-    def connect_active_viewer(self, group_node):
-        """
-        Finds Active viewer and
-        place the node under it, also adds
-        name of group into Input Process of the viewer
-
-        Arguments:
-            group_node (nuke node): nuke group node object
-
-        """
-        group_node_name = group_node["name"].value()
-
-        viewer = [n for n in nuke.allNodes() if "Viewer1" in n["name"].value()]
-        if len(viewer) > 0:
-            viewer = viewer[0]
-        else:
-            if not (len(nodes) < 2):
-                msg = "Please create Viewer node before you "
-                      "run this action again"
-                self.log.error(msg)
-                nuke.message(msg)
-            return None
-
-        # get coordinates of Viewer1
-        xpos = viewer["xpos"].value()
-        ypos = viewer["ypos"].value()
-
-        ypos += 150
-
-        viewer["ypos"].setValue(ypos)
-
-        # set coordinates to group node
-        group_node["xpos"].setValue(xpos)
-        group_node["ypos"].setValue(ypos + 50)
-
-        # add group node name to Viewer Input Process
-        viewer["input_process_node"].setValue(group_node_name)
-
-        # put backdrop under
-        pnlib.create_backdrop(label="Input Process", layer=2,
-                              nodes=[viewer, group_node], color="0x7c7faaff")
-
-        return True
-
-    def get_item(self, data, trackIndex, subTrackIndex):
-        return {key: val for key, val in data.items()
-                if subTrackIndex == val["subTrackIndex"]
-                if trackIndex == val["trackIndex"]}
-
-    def byteify(self, input):
-        """
-        Converts unicode strings to strings
-        It goes trought all dictionary
-
-        Arguments:
-            input (dict/str): input
-
-        Returns:
-            dict: with fixed values and keys
-
-        """
-
-        if isinstance(input, dict):
-            return {self.byteify(key): self.byteify(value)
-                    for key, value in input.iteritems()}
-        elif isinstance(input, list):
-            return [self.byteify(element) for element in input]
-        elif isinstance(input, unicode):
-            return input.encode('utf-8')
-        else:
-            return input
 
     def switch(self, container, representation):
         self.update(container, representation)

pype/plugins/nuke/publish/collect_backdrop.py

@@ -58,7 +58,11 @@ class CollectBackdrops(pyblish.api.InstancePlugin):
         last_frame = int(nuke.root()["last_frame"].getValue())
 
         # get version
-        version = pype.get_version_from_path(nuke.root().name())
+        version = instance.context.data.get('version')
+
+        if not version:
+            raise RuntimeError("Script name has no version in the name.")
+
         instance.data['version'] = version
 
         # Add version data to instance