From 08b9f3d3c05ea38279853bc9a4b7c464b412219a Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 May 2024 23:20:18 +0200 Subject: [PATCH 1/6] Fix #522: Validate workfile paths skip parms with keyframes --- .../houdini/plugins/publish/validate_workfile_paths.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py index 7984b7615c..cc10407df6 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py @@ -69,6 +69,12 @@ class ValidateWorkfilePaths( if param.node().type().name() not in cls.node_types: continue + if param.keyframes(): + # Calling `.unexpandedString()` below fails if param has + # keyframes - so for now we will skip those params. These are + # e.g. present in `filecache` nodes. + continue + if any( v for v in cls.prohibited_vars if v in param.unexpandedString()): From 8214147db157ee28815d3e0b69bf51240e694d9b Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 3 Jun 2024 17:22:17 +0200 Subject: [PATCH 2/6] Bump version --- server_addon/houdini/client/ayon_houdini/version.py | 2 +- server_addon/houdini/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server_addon/houdini/client/ayon_houdini/version.py b/server_addon/houdini/client/ayon_houdini/version.py index a30c770e1d..eff044feba 100644 --- a/server_addon/houdini/client/ayon_houdini/version.py +++ b/server_addon/houdini/client/ayon_houdini/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Houdini addon version.""" -__version__ = "0.3.0" +__version__ = "0.3.1" diff --git a/server_addon/houdini/package.py b/server_addon/houdini/package.py index 275d21c1bf..a8884ff60a 100644 --- a/server_addon/houdini/package.py +++ b/server_addon/houdini/package.py @@ -1,6 +1,6 @@ name = "houdini" title = "Houdini" -version = "0.3.0" +version = "0.3.1" client_dir = "ayon_houdini" From b2921651ae5fb812b4771dfa5d917dcd48049f6b Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 17 Jun 2024 20:43:08 +0800 Subject: [PATCH 3/6] implement backward compatibility for the settting version up workfile --- server_addon/maya/client/ayon_maya/api/menu.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/api/menu.py b/server_addon/maya/client/ayon_maya/api/menu.py index a6f8ae2db0..131c406cb4 100644 --- a/server_addon/maya/client/ayon_maya/api/menu.py +++ b/server_addon/maya/client/ayon_maya/api/menu.py @@ -75,8 +75,9 @@ def install(project_settings): cmds.setParent("..", menu=True) - if project_settings["core"]["tools"]["ayon_menu"].get( - "version_up_current_workfile"): + ayon_menu = project_settings["core"]["tools"].get("ayon_menu") + if ayon_menu: + if ayon_menu.get("version_up_current_workfile"): cmds.menuItem(divider=True) cmds.menuItem( "Version Up Workfile", From 4640f115de3b2f605479a42ffbafbc470ebb5079 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 17 Jun 2024 21:02:19 +0800 Subject: [PATCH 4/6] implement try except statement - ondrej's comment --- .../maya/client/ayon_maya/api/menu.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/server_addon/maya/client/ayon_maya/api/menu.py b/server_addon/maya/client/ayon_maya/api/menu.py index 131c406cb4..4693d0e131 100644 --- a/server_addon/maya/client/ayon_maya/api/menu.py +++ b/server_addon/maya/client/ayon_maya/api/menu.py @@ -75,14 +75,17 @@ def install(project_settings): cmds.setParent("..", menu=True) - ayon_menu = project_settings["core"]["tools"].get("ayon_menu") - if ayon_menu: - if ayon_menu.get("version_up_current_workfile"): - cmds.menuItem(divider=True) - cmds.menuItem( - "Version Up Workfile", - command=lambda *args: version_up_current_workfile() - ) + try: + if project_settings["core"]["tools"]["ayon_menu"].get( + "version_up_current_workfile"): + cmds.menuItem(divider=True) + cmds.menuItem( + "Version Up Workfile", + command=lambda *args: version_up_current_workfile() + ) + except KeyError: + print("Version Up Workfile setting not found in " + "Core Settings. Please update Core Addon") cmds.menuItem(divider=True) From 565188e772875203d9beb1df52b157798c06b5ac Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:38:21 +0200 Subject: [PATCH 5/6] fix deprecated import in loader tool --- client/ayon_core/tools/loader/control.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py index ee0b2f4b9d..f4b00e985f 100644 --- a/client/ayon_core/tools/loader/control.py +++ b/client/ayon_core/tools/loader/control.py @@ -3,14 +3,13 @@ import uuid import ayon_api +from ayon_core.lib import NestedCacheItem, CacheItem from ayon_core.lib.events import QueuedEventSystem from ayon_core.pipeline import Anatomy, get_current_context from ayon_core.host import ILoadHost from ayon_core.tools.common_models import ( ProjectsModel, HierarchyModel, - NestedCacheItem, - CacheItem, ThumbnailsModel, ) From 3ee74b92b9bcd4b72f1cc06f8b91adb58aa48f1a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:22:23 +0200 Subject: [PATCH 6/6] bump version to 0.3.2 --- server_addon/houdini/client/ayon_houdini/version.py | 2 +- server_addon/houdini/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server_addon/houdini/client/ayon_houdini/version.py b/server_addon/houdini/client/ayon_houdini/version.py index 87d445d563..10d1478249 100644 --- a/server_addon/houdini/client/ayon_houdini/version.py +++ b/server_addon/houdini/client/ayon_houdini/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'houdini' version.""" -__version__ = "0.3.1" +__version__ = "0.3.2" diff --git a/server_addon/houdini/package.py b/server_addon/houdini/package.py index a8884ff60a..1f7879483e 100644 --- a/server_addon/houdini/package.py +++ b/server_addon/houdini/package.py @@ -1,6 +1,6 @@ name = "houdini" title = "Houdini" -version = "0.3.1" +version = "0.3.2" client_dir = "ayon_houdini"