From 1c9fbb145b6e9225f1e96a5b5f6b5e88d597d6a0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:30:39 +0200 Subject: [PATCH 1/2] validate if deadline addon settings are available --- .../plugins/publish/collect_file_dependencies.py | 10 +++++++++- .../plugins/publish/extract_import_reference.py | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py index 74b8054c33..db797f0d09 100644 --- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py @@ -13,7 +13,15 @@ class CollectFileDependencies(plugin.MayaContextPlugin): @classmethod def apply_settings(cls, project_settings): # Disable plug-in if not used for deadline submission anyway - settings = project_settings["deadline"]["publish"]["MayaSubmitDeadline"] # noqa + if "deadline" not in project_settings: + cls.enabled = False + return + settings = ( + project_settings + ["deadline"] + ["publish"] + ["MayaSubmitDeadline"] + ) cls.enabled = settings.get("asset_dependencies", True) def process(self, context): diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py index b5964e426b..6a0c7719a8 100644 --- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py @@ -28,7 +28,16 @@ class ExtractImportReference(plugin.MayaExtractorPlugin, @classmethod def apply_settings(cls, project_settings): - cls.active = project_settings["deadline"]["publish"]["MayaSubmitDeadline"]["import_reference"] # noqa + if "deadline" not in project_settings: + cls.enabled = False + return + cls.active = ( + project_settings + ["deadline"] + ["publish"] + ["MayaSubmitDeadline"] + ["import_reference"] + ) def process(self, instance): if not self.is_active(instance.data): From 82ff863112738d502bcbd004c33e7123a87f22b6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:32:29 +0200 Subject: [PATCH 2/2] bump maya version to '0.2.4' --- server_addon/maya/client/ayon_maya/version.py | 2 +- server_addon/maya/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/version.py b/server_addon/maya/client/ayon_maya/version.py index fcad19941f..37f9026945 100644 --- a/server_addon/maya/client/ayon_maya/version.py +++ b/server_addon/maya/client/ayon_maya/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'maya' version.""" -__version__ = "0.2.3" +__version__ = "0.2.4" diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py index e0fc2ee5cf..17614ed9c1 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -1,6 +1,6 @@ name = "maya" title = "Maya" -version = "0.2.3" +version = "0.2.4" client_dir = "ayon_maya" ayon_required_addons = {