submiting from presets and env filtering

pype/plugins/celaction/publish/submit_celaction_deadline.py

@@ -169,55 +169,13 @@ class ExtractCelactionDeadline(pyblish.api.InstancePlugin):
 
         # Include critical environment variables with submission
         keys = [
-            "PYTHONPATH",
-            "PATH",
-            "AVALON_SCHEMA",
-            "PYBLISHPLUGINPATH",
-            "TOOL_ENV"
+            "FTRACK_API_USER",
+            "FTRACK_API_KEY",
+            "FTRACK_SERVER",
+            "AVALON_PROJECT"
         ]
         environment = dict({key: os.environ[key] for key in keys
-                            if key in os.environ}, **api.Session)
-
-        for path in os.environ:
-            if path.lower().startswith('pype_'):
-                environment[path] = os.environ[path]
-
-        environment["PATH"] = os.environ["PATH"]
-        clean_environment = {}
-        for key in environment:
-            clean_path = ""
-            self.log.debug("key: {}".format(key))
-            to_process = environment[key]
-            if key == "PYPE_STUDIO_CORE_MOUNT":
-                clean_path = environment[key]
-            elif "://" in environment[key]:
-                clean_path = environment[key]
-            elif os.pathsep not in to_process:
-                try:
-                    path = environment[key]
-                    path.encode().decode('UTF-8', 'strict')
-                    clean_path = os.path.normpath(path)
-                except UnicodeDecodeError:
-                    print('path contains non UTF characters')
-            else:
-                for path in environment[key].split(os.pathsep):
-                    try:
-                        path.encode().decode('UTF-8', 'strict')
-                        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']),  # noqa
-                                    os.path.normpath(
-                                        environment['PYPE_STUDIO_CORE_PATH']))   # noqa
-            clean_environment[key] = clean_path
-
-        environment = clean_environment
+                            if key in os.environ})
 
         payload["JobInfo"].update({
             "EnvironmentKeyValue%d" % index: "{key}={value}".format(

pype/plugins/global/publish/submit_publish_job.py

@@ -146,20 +146,23 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
     aov_filter = {"maya": ["beauty"]}
 
     enviro_filter = [
-        "PATH",
-        "PYTHONPATH",
+        # "PYTHONPATH",
         "FTRACK_API_USER",
         "FTRACK_API_KEY",
         "FTRACK_SERVER",
-        "PYPE_ROOT",
+        "PYPE_LOG_NO_COLORS",
         "PYPE_METADATA_FILE",
-        "PYPE_STUDIO_PROJECTS_PATH",
-        "PYPE_STUDIO_PROJECTS_MOUNT",
-        "AVALON_PROJECT"
+        "AVALON_PROJECT",
+        "PYPE_PYTHON_EXE",
+        "PYTHONPATH"
     ]
 
-    # pool used to do the publishing job
+    # custom deadline atributes
+    deadline_department = ""
     deadline_pool = ""
+    deadline_pool_secondary = ""
+    deadline_group = ""
+    deadline_chunk_size = 1
 
     # regex for finding frame number in string
     R_FRAME_NUMBER = re.compile(r'.+\.(?P<frame>[0-9]+)\..+')
@@ -206,8 +209,15 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                 "JobDependency0": job["_id"],
                 "UserName": job["Props"]["User"],
                 "Comment": instance.context.data.get("comment", ""),
+
+                "Department": self.deadline_department,
+                "ChunkSize": self.deadline_chunk_size,
                 "Priority": job["Props"]["Pri"],
+
+                "Group": self.deadline_group,
                 "Pool": self.deadline_pool,
+                "SecondaryPool": self.deadline_pool_secondary,
+
                 "OutputDirectory0": output_dir
             },
             "PluginInfo": {
@@ -223,6 +233,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         # Transfer the environment from the original job to this dependent
         # job so they use the same environment
         environment = job["Props"].get("Env", {})
+        environment["PYPE_PYTHON_EXE"] = "//pype/Core/software/python36/python.exe"
+        environment["PYPE_LOG_NO_COLORS"] = "1"
         environment["PYPE_METADATA_FILE"] = metadata_path
         environment["AVALON_PROJECT"] = io.Session["AVALON_PROJECT"]
         i = 0