hotfix/minot fixes for submitting maya to deadline in 2.0

pype/ftrack/lib/ftrack_app_handler.py

@@ -193,7 +193,7 @@ class AppAction(BaseHandler):
         application = avalonlib.get_application(os.environ["AVALON_APP_NAME"])
 
         data = {
-            "root": os.environ.get("PYPE_STUDIO_PROJECTS_PATH"),
+            "root": os.environ.get("PYPE_STUDIO_PROJECTS_MOUNT"),
             "project": {
                 "name": entity['project']['full_name'],
                 "code": entity['project']['name']

pype/plugins/global/publish/collect_scene_version.py

@@ -1,8 +1,8 @@
 import os
 import pyblish.api
-import os
 import pype.api as pype
 
+
 class CollectSceneVersion(pyblish.api.ContextPlugin):
     """Finds version in the filename or passes the one found in the context
         Arguments:
@@ -16,8 +16,10 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
 
         filename = os.path.basename(context.data.get('currentFile'))
 
-        rootVersion = pype.get_version_from_path(filename)
+        if '<shell>' in filename:
+            return
 
+        rootVersion = pype.get_version_from_path(filename)
         context.data['version'] = rootVersion
 
         self.log.info('Scene Version: %s' % context.data('version'))

pype/plugins/maya/publish/collect_renderlayers.py

@@ -21,11 +21,14 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin):
         # Get render globals node
         try:
             render_globals = cmds.ls("renderglobalsMain")[0]
+            for instance in context:
+                self.log.debug(instance.name)
+                if instance.data['family'] == 'workfile':
+                    instance.data['publish'] = True
         except IndexError:
             self.log.info("Skipping renderlayer collection, no "
                           "renderGlobalsDefault found..")
             return
-
         # Get all valid renderlayers
         # This is how Maya populates the renderlayer display
         rlm_attribute = "renderLayerManager.renderLayerId"
@@ -51,7 +54,7 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin):
                 continue
 
             if layer.endswith("defaultRenderLayer"):
-                layername = "masterLayer"
+                continue
             else:
                 # Remove Maya render setup prefix `rs_`
                 layername = layer.split("rs_", 1)[-1]

pype/plugins/maya/publish/submit_maya_deadline.py

@@ -280,7 +280,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
                 clean_path = clean_path.replace('python2', 'python3')
             clean_path = clean_path.replace(
                                             os.path.normpath(environment['PYPE_STUDIO_CORE_MOUNT']),
-                                            os.path.normpath(environment['PYPE_STUDIO_CORE']))
+                                            os.path.normpath(environment['PYPE_STUDIO_CORE_PATH']))
             clean_environment[key] = clean_path
 
         environment = clean_environment