Merged in bugfix/3de-sync-fixes (pull request #368)

small bugfixes arising from syncing with 3de

Approved-by: Milan Kolar <milan@orbi.tools>

pype/plugins/ftrack/publish/integrate_ftrack_instances.py

@@ -37,6 +37,8 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
 
         if instance.data.get('version'):
             version_number = int(instance.data.get('version'))
+        else:
+            raise ValueError("Instance version not set")
 
         family = instance.data['family'].lower()
 

pype/plugins/global/publish/integrate_new.py

@@ -1,18 +1,23 @@
 import os
 from os.path import getsize
 import logging
-import speedcopy
+import sys
 import clique
 import errno
 import pyblish.api
 from avalon import api, io
 from avalon.vendor import filelink
+# this is needed until speedcopy for linux is fixed
+if sys.platform == "win32":
+    from speedcopy import copyfile
+else:
+    from shutil import copyfile
 
 log = logging.getLogger(__name__)
 
 
 class IntegrateAssetNew(pyblish.api.InstancePlugin):
-    """Resolve any dependency issius
+    """Resolve any dependency issues
 
     This plug-in resolves any paths which, if not updated might break
     the published file.
@@ -475,7 +480,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
 
         # copy file with speedcopy and check if size of files are simetrical
         while True:
-            speedcopy.copyfile(src, dst)
+            copyfile(src, dst)
             if str(getsize(src)) in str(getsize(dst)):
                 break
 
@@ -501,7 +506,8 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
             subset_name = instance.data["subset"]
             self.log.info("Subset '%s' not found, creating.." % subset_name)
             self.log.debug("families.  %s" % instance.data.get('families'))
-            self.log.debug("families.  %s" % type(instance.data.get('families')))
+            self.log.debug(
+                "families.  %s" % type(instance.data.get('families')))
 
             _id = io.insert_one({
                 "schema": "pype:subset-3.0",

pype/plugins/global/publish/validate_templates.py

@@ -1,8 +1,9 @@
 import pyblish.api
 import os
 
+
 class ValidateTemplates(pyblish.api.ContextPlugin):
-    """Check if all templates were filed"""
+    """Check if all templates were filled"""
 
     label = "Validate Templates"
     order = pyblish.api.ValidatorOrder - 0.1
@@ -18,12 +19,12 @@ class ValidateTemplates(pyblish.api.ContextPlugin):
                     "root": os.environ["PYPE_STUDIO_PROJECTS_PATH"],
                     "project": {"name": "D001_projectsx",
                                 "code": "prjX"},
-                     "ext": "exr",
-                     "version": 3,
-                     "task": "animation",
-                     "asset": "sh001",
-                     "hierarchy": "ep101/sq01/sh010"}
-
+                    "ext": "exr",
+                    "version": 3,
+                    "task": "animation",
+                    "asset": "sh001",
+                    "app": "maya",
+                    "hierarchy": "ep101/sq01/sh010"}
 
             anatomy_filled = anatomy.format(data)
             self.log.info(anatomy_filled)
@@ -31,11 +32,12 @@ class ValidateTemplates(pyblish.api.ContextPlugin):
             data = {"root": os.environ["PYPE_STUDIO_PROJECTS_PATH"],
                     "project": {"name": "D001_projectsy",
                                 "code": "prjY"},
-                     "ext": "abc",
-                     "version": 1,
-                     "task": "lookdev",
-                     "asset": "bob",
-                     "hierarchy": "ep101/sq01/bob"}
+                    "ext": "abc",
+                    "version": 1,
+                    "task": "lookdev",
+                    "asset": "bob",
+                    "app": "maya",
+                    "hierarchy": "ep101/sq01/bob"}
 
             anatomy_filled = context.data["anatomy"].format(data)
             self.log.info(anatomy_filled["work"]["folder"])

pype/plugins/maya/create/create_renderglobals.py

@@ -38,7 +38,7 @@ class CreateRenderGlobals(avalon.maya.Creator):
             self.log.warning("Deadline REST API url not found.")
         else:
             argument = "{}/api/pools?NamesOnly=true".format(deadline_url)
-            response = requests.get(argument)
+            response = self._requests_get(argument)
             if not response.ok:
                 self.log.warning("No pools retrieved")
             else:
@@ -135,7 +135,7 @@ class CreateRenderGlobals(avalon.maya.Creator):
                 'authToken': self._token
             }
         api_entry = '/api/pools/list'
-        response = requests.get(
+        response = self._requests_get(
             self.MUSTER_REST_URL + api_entry, params=params)
         if response.status_code != 200:
             if response.status_code == 401: