From 6a169143d1e542095a5043d5703f7d55c9a05672 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 28 Feb 2019 19:00:22 +0100
Subject: [PATCH] add correct environment to deadline job when submitting to
 support quicktime generation

---
 pype/plugins/global/publish/submit_publish_job.py |  2 +-
 pype/plugins/maya/publish/submit_maya_deadline.py | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py
index 9e80be4898..cca72e0a81 100644
--- a/pype/plugins/global/publish/submit_publish_job.py
+++ b/pype/plugins/global/publish/submit_publish_job.py
@@ -133,7 +133,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin):
 
     def process(self, instance):
 
-        DEADLINE_REST_URL = api.Session.get("DEADLINE_REST_URL",
+        DEADLINE_REST_URL = os.environ.get("DEADLINE_REST_URL",
                                           "http://localhost:8082")
         assert DEADLINE_REST_URL, "Requires DEADLINE_REST_URL"
 
diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/plugins/maya/publish/submit_maya_deadline.py
index e476e62bb4..56e4b1ea32 100644
--- a/pype/plugins/maya/publish/submit_maya_deadline.py
+++ b/pype/plugins/maya/publish/submit_maya_deadline.py
@@ -104,7 +104,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
     def process(self, instance):
 
-        DEADLINE_REST_URL = api.Session.get("DEADLINE_REST_URL",
+        DEADLINE_REST_URL = os.environ.get("DEADLINE_REST_URL",
                                           "http://localhost:8082")
         assert DEADLINE_REST_URL, "Requires DEADLINE_REST_URL"
 
@@ -231,14 +231,14 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
             "MAYA_MODULE_PATH",
             "ARNOLD_PLUGIN_PATH",
             "AVALON_SCHEMA",
+            "FTRACK_API_KEY",
+            "FTRACK_API_USER",
+            "FTRACK_SERVER",
+            "PYBLISHPLUGINPATH",
 
             # todo: This is a temporary fix for yeti variables
             "PEREGRINEL_LICENSE",
-            "REDSHIFT_MAYAEXTENSIONSPATH",
-            "REDSHIFT_DISABLEOUTPUTLOCKFILES"
-            "VRAY_FOR_MAYA2018_PLUGINS_X64",
-            "VRAY_PLUGINS_X64",
-            "VRAY_USE_THREAD_AFFINITY",
+            "ARNOLD_LICENSE"
             "MAYA_MODULE_PATH",
             "TOOL_ENV"
         ]
@@ -274,6 +274,9 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
                         clean_path += os.path.normpath(path) + os.pathsep
                     except UnicodeDecodeError:
                         print('path contains non UTF characters')
+
+            if key == "PYTHONPATH":
+                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']))