diff --git a/pype/plugins/global/publish/collect_assumed_destination.py b/pype/plugins/global/publish/collect_assumed_destination.py index 2f567ebbb2..7de358b422 100644 --- a/pype/plugins/global/publish/collect_assumed_destination.py +++ b/pype/plugins/global/publish/collect_assumed_destination.py @@ -1,7 +1,7 @@ import os import pyblish.api -from avalon import io, api, lib +from avalon import io, api class CollectAssumedDestination(pyblish.api.InstancePlugin): @@ -67,7 +67,7 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin): if hierarchy: # hierarchy = os.path.sep.join(hierarchy) hierarchy = os.path.join(*hierarchy) - application = lib.get_application(os.environ["AVALON_APP_NAME"]) + template_data = {"root": api.Session["AVALON_PROJECTS"], "project": {"name": project_name, "code": project['data']['code']}, @@ -77,8 +77,7 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin): "subset": subset_name, "version": version_number, "hierarchy": hierarchy, - "representation": "TEMP", - "app": application["application_dir"]} + "representation": "TEMP"} instance.data["template"] = template instance.data["assumedTemplateData"] = template_data diff --git a/pype/plugins/global/publish/integrate.py b/pype/plugins/global/publish/integrate.py index 5fd8a13670..00096a95ee 100644 --- a/pype/plugins/global/publish/integrate.py +++ b/pype/plugins/global/publish/integrate.py @@ -4,7 +4,7 @@ import shutil import errno import pyblish.api -from avalon import api, io, lib +from avalon import api, io from avalon.vendor import filelink @@ -160,7 +160,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin): if parents and len(parents) > 0: # hierarchy = os.path.sep.join(hierarchy) hierarchy = os.path.join(*parents) - application = lib.get_application(os.environ["AVALON_APP_NAME"]) + template_data = {"root": root, "project": {"name": PROJECT, "code": project['data']['code']}, @@ -169,8 +169,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin): "family": instance.data['family'], "subset": subset["name"], "version": int(version["name"]), - "hierarchy": hierarchy, - "app": application["application_dir"]} + "hierarchy": hierarchy} template_publish = project["config"]["template"]["publish"] anatomy = instance.context.data['anatomy'] @@ -261,8 +260,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin): "subset": subset["name"], "version": version["name"], "hierarchy": hierarchy, - "representation": ext[1:], - "app": application["application_dir"] + "representation": ext[1:] } } diff --git a/pype/plugins/global/publish/integrate_rendered_frames.py b/pype/plugins/global/publish/integrate_rendered_frames.py index 3a0e89c328..8e7e2a59c4 100644 --- a/pype/plugins/global/publish/integrate_rendered_frames.py +++ b/pype/plugins/global/publish/integrate_rendered_frames.py @@ -5,7 +5,7 @@ import clique import errno import pyblish.api -from avalon import api, io, lib +from avalon import api, io log = logging.getLogger(__name__) @@ -148,7 +148,7 @@ class IntegrateFrames(pyblish.api.InstancePlugin): if parents and len(parents) > 0: # hierarchy = os.path.sep.join(hierarchy) hierarchy = os.path.join(*parents) - application = lib.get_application(os.environ["AVALON_APP_NAME"]) + template_data = {"root": root, "project": {"name": PROJECT, "code": project['data']['code']}, @@ -158,8 +158,7 @@ class IntegrateFrames(pyblish.api.InstancePlugin): "family": instance.data['family'], "subset": subset["name"], "version": int(version["name"]), - "hierarchy": hierarchy, - "app": application["application_dir"]} + "hierarchy": hierarchy} # template_publish = project["config"]["template"]["publish"] anatomy = instance.context.data['anatomy'] @@ -273,8 +272,7 @@ class IntegrateFrames(pyblish.api.InstancePlugin): "subset": subset["name"], "version": int(version["name"]), "hierarchy": hierarchy, - "representation": ext[1:], - "app": application["application_dir"] + "representation": ext[1:] } } diff --git a/pype/plugins/global/publish/validate_templates.py b/pype/plugins/global/publish/validate_templates.py index 19d70a197c..8f8eb45686 100644 --- a/pype/plugins/global/publish/validate_templates.py +++ b/pype/plugins/global/publish/validate_templates.py @@ -22,8 +22,7 @@ class ValidateTemplates(pyblish.api.ContextPlugin): "version": 3, "task": "animation", "asset": "sh001", - "hierarchy": "ep101/sq01/sh010", - "app": "nuke"} + "hierarchy": "ep101/sq01/sh010"} anatomy = context.data["anatomy"].format(data) @@ -35,8 +34,7 @@ class ValidateTemplates(pyblish.api.ContextPlugin): "version": 1, "task": "lookdev", "asset": "bob", - "hierarchy": "ep101/sq01/bob", - "app": "nuke"} + "hierarchy": "ep101/sq01/bob"} anatomy = context.data["anatomy"].format(data) self.log.info(anatomy.work.file)