diff --git a/pype/plugins/ftrack/integrate_ftrack_instances.py b/pype/plugins/ftrack/integrate_ftrack_instances.py index 491428a33d..89246397d4 100644 --- a/pype/plugins/ftrack/integrate_ftrack_instances.py +++ b/pype/plugins/ftrack/integrate_ftrack_instances.py @@ -36,7 +36,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): self.log.debug('instance {}'.format(instance)) assumed_data = instance.data["assumedTemplateData"] - assumed_version = assumed_data["VERSION"] + assumed_version = assumed_data["version"] version_number = int(assumed_version) family = instance.data['family'].lower() asset_type = '' diff --git a/pype/plugins/global/publish/collect_assumed_destination.py b/pype/plugins/global/publish/collect_assumed_destination.py index 2343861efc..d5d3d9a846 100644 --- a/pype/plugins/global/publish/collect_assumed_destination.py +++ b/pype/plugins/global/publish/collect_assumed_destination.py @@ -108,7 +108,7 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin): # if there is a subset there ought to be version if version is not None: - version_number += version["name"] + version_number += int(version["name"]) hierarchy = asset['data']['parents'] if hierarchy: @@ -122,7 +122,7 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin): "family": instance.data['family'], "asset": asset_name, "subset": subset_name, - "VERSION": version_number, + "version": version_number, "hierarchy": hierarchy, "representation": "TEMP"} diff --git a/pype/plugins/global/publish/integrate.py b/pype/plugins/global/publish/integrate.py index f7c14d990c..904b6848ae 100644 --- a/pype/plugins/global/publish/integrate.py +++ b/pype/plugins/global/publish/integrate.py @@ -112,7 +112,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin): self.log.info("Verifying version from assumed destination") assumed_data = instance.data["assumedTemplateData"] - assumed_version = assumed_data["VERSION"] + assumed_version = assumed_data["version"] if assumed_version != next_version: raise AttributeError("Assumed version 'v{0:03d}' does not match" "next version in database " @@ -153,7 +153,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin): "asset": ASSET, "family": instance.data['family'], "subset": subset["name"], - "VERSION": version["name"], + "version": int(version["name"]), "hierarchy": hierarchy} template_publish = project["config"]["template"]["publish"] diff --git a/pype/plugins/global/publish/integrate_rendered_frames.py b/pype/plugins/global/publish/integrate_rendered_frames.py index d24536c17f..9600cad887 100644 --- a/pype/plugins/global/publish/integrate_rendered_frames.py +++ b/pype/plugins/global/publish/integrate_rendered_frames.py @@ -110,7 +110,7 @@ class IntegrateFrames(pyblish.api.InstancePlugin): self.log.info("Verifying version from assumed destination") assumed_data = instance.data["assumedTemplateData"] - assumed_version = assumed_data["VERSION"] + assumed_version = assumed_data["version"] if assumed_version != next_version: raise AttributeError("Assumed version 'v{0:03d}' does not match" "next version in database " @@ -153,7 +153,7 @@ class IntegrateFrames(pyblish.api.InstancePlugin): "asset": ASSET, "family": instance.data['family'], "subset": subset["name"], - "VERSION": version["name"], + "version": int(version["name"]), "hierarchy": hierarchy} # template_publish = project["config"]["template"]["publish"] @@ -260,7 +260,7 @@ class IntegrateFrames(pyblish.api.InstancePlugin): "asset": ASSET, "family": instance.data['family'], "subset": subset["name"], - "VERSION": version["name"], + "version": int(version["name"]), "hierarchy": hierarchy, "representation": ext[1:] } diff --git a/pype/plugins/global/publish/validate_templates.py b/pype/plugins/global/publish/validate_templates.py index f806104bb2..8f8eb45686 100644 --- a/pype/plugins/global/publish/validate_templates.py +++ b/pype/plugins/global/publish/validate_templates.py @@ -19,8 +19,7 @@ class ValidateTemplates(pyblish.api.ContextPlugin): data = { "project": {"name": "D001_projectsx", "code": "prjX"}, "representation": "exr", - "VERSION": 3, - "SUBVERSION": 10, + "version": 3, "task": "animation", "asset": "sh001", "hierarchy": "ep101/sq01/sh010"} @@ -32,8 +31,7 @@ class ValidateTemplates(pyblish.api.ContextPlugin): data = { "project": {"name": "D001_projectsy", "code": "prjY"}, "representation": "abc", - "VERSION": 1, - "SUBVERSION": 5, + "version": 1, "task": "lookdev", "asset": "bob", "hierarchy": "ep101/sq01/bob"}