From e335d0f3c8bb271fe0428971ab35f90a3c2cfd80 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:14:18 +0200 Subject: [PATCH 01/23] use direct ayon_weblisher import --- .../client/ayon_photoshop/plugins/publish/collect_batch_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_batch_data.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_batch_data.py index c43a957576..527a7d516a 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_batch_data.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_batch_data.py @@ -17,7 +17,7 @@ import os import pyblish.api -from openpype_modules.webpublisher.lib import ( +from ayon_webpublisher.lib import ( get_batch_context_info, parse_json ) From 6fad829a0b54e3bcdd93666d2a19499306227715 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:14:28 +0200 Subject: [PATCH 02/23] fix apply of settings in royal render --- .../plugins/publish/collect_sequences_from_job.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_sequences_from_job.py b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_sequences_from_job.py index 7f7b89590c..5e0ea0e258 100644 --- a/server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_sequences_from_job.py +++ b/server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_sequences_from_job.py @@ -76,6 +76,7 @@ class CollectSequencesFromJob(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder targets = ["rr_control"] label = "Collect Rendered Frames" + settings_category = "royalrender" review = True def process(self, context): From cee23f3320f0fcbacd9102e0e760963c0b35463d Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:36:23 +0200 Subject: [PATCH 03/23] remove moved or removed filenames --- client/ayon_core/addon/base.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index c4407424cc..afb37b8738 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -37,13 +37,7 @@ IGNORED_DEFAULT_FILENAMES = ( "base.py", "interfaces.py", "click_wrap.py", - "example_addons", - "default_modules", ) -IGNORED_HOSTS_IN_AYON = { - "flame", - "harmony", -} IGNORED_MODULES_IN_AYON = set() # When addon was moved from ayon-core codebase From 430ad8911f84815a6726da9d6b940ced047ecf52 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:36:47 +0200 Subject: [PATCH 04/23] removed useless variables --- client/ayon_core/addon/base.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index afb37b8738..e498b9e5e1 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -38,7 +38,6 @@ IGNORED_DEFAULT_FILENAMES = ( "interfaces.py", "click_wrap.py", ) -IGNORED_MODULES_IN_AYON = set() # When addon was moved from ayon-core codebase # - this is used to log the missing addon @@ -412,12 +411,6 @@ def _load_addons_in_core( hosts_dir = os.path.join(AYON_CORE_ROOT, "hosts") modules_dir = os.path.join(AYON_CORE_ROOT, "modules") - ignored_host_names = set(IGNORED_HOSTS_IN_AYON) - ignored_module_dir_filenames = ( - set(IGNORED_DEFAULT_FILENAMES) - | IGNORED_MODULES_IN_AYON - ) - for dirpath in {hosts_dir, modules_dir}: if not os.path.exists(dirpath): log.warning(( @@ -426,10 +419,9 @@ def _load_addons_in_core( continue is_in_modules_dir = dirpath == modules_dir + ignored_filenames = set() if is_in_modules_dir: - ignored_filenames = ignored_module_dir_filenames - else: - ignored_filenames = ignored_host_names + ignored_filenames = set(IGNORED_DEFAULT_FILENAMES) for filename in os.listdir(dirpath): # Ignore filenames From 784528df58d2845039533e2360347c957962d2ae Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:37:07 +0200 Subject: [PATCH 05/23] don't try to make openpype compatibility --- client/ayon_core/addon/base.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index e498b9e5e1..8fed0475dd 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -487,9 +487,6 @@ def _load_addons_in_core( def _load_addons(): - # Support to use 'openpype' imports - sys.modules["openpype"] = sys.modules["ayon_core"] - # Key under which will be modules imported in `sys.modules` modules_key = "openpype_modules" From 6fd8a18f2742f4c0d3a0b4acff56440ba528e247 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:37:15 +0200 Subject: [PATCH 06/23] fix class name in readme --- client/ayon_core/addon/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/addon/README.md b/client/ayon_core/addon/README.md index 88c27db154..e1c04ea0d6 100644 --- a/client/ayon_core/addon/README.md +++ b/client/ayon_core/addon/README.md @@ -35,14 +35,14 @@ AYON addons should contain separated logic of specific kind of implementation, s - addon has more logic when used in a tray - it is possible that addon can be used only in the tray - abstract methods - - `tray_init` - initialization triggered after `initialize` when used in `TrayModulesManager` and before `connect_with_addons` + - `tray_init` - initialization triggered after `initialize` when used in `TrayAddonsManager` and before `connect_with_addons` - `tray_menu` - add actions to tray widget's menu that represent the addon - `tray_start` - start of addon's login in tray - addon is initialized and connected with other addons - `tray_exit` - addon's cleanup like stop and join threads etc. - - order of calling is based on implementation this order is how it works with `TrayModulesManager` + - order of calling is based on implementation this order is how it works with `TrayAddonsManager` - it is recommended to import and use GUI implementation only in these methods -- has attribute `tray_initialized` (bool) which is set to False by default and is set by `TrayModulesManager` to True after `tray_init` +- has attribute `tray_initialized` (bool) which is set to False by default and is set by `TrayAddonsManager` to True after `tray_init` - if addon has logic only in tray or for both then should be checking for `tray_initialized` attribute to decide how should handle situations ### ITrayService From eb0083fc78dfdd860a858af90adc1b6168786f04 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:44:50 +0200 Subject: [PATCH 07/23] add version to applications client addon class --- server_addon/applications/client/ayon_applications/__init__.py | 3 +++ server_addon/applications/client/ayon_applications/addon.py | 2 ++ server_addon/applications/client/ayon_applications/version.py | 0 server_addon/applications/package.py | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 server_addon/applications/client/ayon_applications/version.py diff --git a/server_addon/applications/client/ayon_applications/__init__.py b/server_addon/applications/client/ayon_applications/__init__.py index c9b72f9914..99d201e49b 100644 --- a/server_addon/applications/client/ayon_applications/__init__.py +++ b/server_addon/applications/client/ayon_applications/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .constants import ( APPLICATIONS_ADDON_ROOT, DEFAULT_ENV_SUBGROUP, @@ -31,6 +32,8 @@ from .addon import ApplicationsAddon __all__ = ( + "__version__", + "APPLICATIONS_ADDON_ROOT", "DEFAULT_ENV_SUBGROUP", "PLATFORM_NAMES", diff --git a/server_addon/applications/client/ayon_applications/addon.py b/server_addon/applications/client/ayon_applications/addon.py index a8eaa46cad..c28d2b475a 100644 --- a/server_addon/applications/client/ayon_applications/addon.py +++ b/server_addon/applications/client/ayon_applications/addon.py @@ -3,6 +3,7 @@ import json from ayon_core.addon import AYONAddon, IPluginPaths, click_wrap +from .version import __version__ from .constants import APPLICATIONS_ADDON_ROOT from .defs import LaunchTypes from .manager import ApplicationManager @@ -10,6 +11,7 @@ from .manager import ApplicationManager class ApplicationsAddon(AYONAddon, IPluginPaths): name = "applications" + version = __version__ def initialize(self, settings): # TODO remove when addon is removed from ayon-core diff --git a/server_addon/applications/client/ayon_applications/version.py b/server_addon/applications/client/ayon_applications/version.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/server_addon/applications/package.py b/server_addon/applications/package.py index 983749355e..a95acad345 100644 --- a/server_addon/applications/package.py +++ b/server_addon/applications/package.py @@ -1,6 +1,6 @@ name = "applications" title = "Applications" -version = "0.2.2" +version = "0.2.3" ayon_server_version = ">=1.0.7" ayon_launcher_version = ">=1.0.2" From f2acf10f1bc5ee810e2adac9755e6099786b2f32 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:45:01 +0200 Subject: [PATCH 08/23] add version to clockify client addon class --- server_addon/clockify/client/ayon_clockify/addon.py | 2 ++ server_addon/clockify/client/ayon_clockify/version.py | 2 +- server_addon/clockify/package.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server_addon/clockify/client/ayon_clockify/addon.py b/server_addon/clockify/client/ayon_clockify/addon.py index ce91b2be70..cf35e77ce4 100644 --- a/server_addon/clockify/client/ayon_clockify/addon.py +++ b/server_addon/clockify/client/ayon_clockify/addon.py @@ -4,11 +4,13 @@ import time from ayon_core.addon import AYONAddon, ITrayAddon, IPluginPaths +from .version import __version__ from .constants import CLOCKIFY_FTRACK_USER_PATH, CLOCKIFY_FTRACK_SERVER_PATH class ClockifyAddon(AYONAddon, ITrayAddon, IPluginPaths): name = "clockify" + version = __version__ def initialize(self, studio_settings): enabled = self.name in studio_settings diff --git a/server_addon/clockify/client/ayon_clockify/version.py b/server_addon/clockify/client/ayon_clockify/version.py index 0e6e40cb7d..36bfd79364 100644 --- a/server_addon/clockify/client/ayon_clockify/version.py +++ b/server_addon/clockify/client/ayon_clockify/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'clockify' version.""" -__version__ = "0.2.0" +__version__ = "0.2.1" diff --git a/server_addon/clockify/package.py b/server_addon/clockify/package.py index 61e0685191..3245e61ca1 100644 --- a/server_addon/clockify/package.py +++ b/server_addon/clockify/package.py @@ -1,6 +1,6 @@ name = "clockify" title = "Clockify" -version = "0.2.0" +version = "0.2.1" client_dir = "ayon_clockify" ayon_required_addons = { From a62478a87b23202f61debf58ea34143ac7684a45 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:45:09 +0200 Subject: [PATCH 09/23] add version to maya client addon class --- server_addon/maya/client/ayon_maya/__init__.py | 3 +++ server_addon/maya/client/ayon_maya/addon.py | 3 +++ server_addon/maya/client/ayon_maya/version.py | 0 server_addon/maya/package.py | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 server_addon/maya/client/ayon_maya/version.py diff --git a/server_addon/maya/client/ayon_maya/__init__.py b/server_addon/maya/client/ayon_maya/__init__.py index bb940a881b..39d990a3c2 100644 --- a/server_addon/maya/client/ayon_maya/__init__.py +++ b/server_addon/maya/client/ayon_maya/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( MayaAddon, MAYA_ROOT_DIR, @@ -5,6 +6,8 @@ from .addon import ( __all__ = ( + "__version__", + "MayaAddon", "MAYA_ROOT_DIR", ) diff --git a/server_addon/maya/client/ayon_maya/addon.py b/server_addon/maya/client/ayon_maya/addon.py index 1ad0fcf4cf..194528bda2 100644 --- a/server_addon/maya/client/ayon_maya/addon.py +++ b/server_addon/maya/client/ayon_maya/addon.py @@ -1,11 +1,14 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + MAYA_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) class MayaAddon(AYONAddon, IHostAddon): name = "maya" + version = __version__ host_name = "maya" def add_implementation_envs(self, env, _app): diff --git a/server_addon/maya/client/ayon_maya/version.py b/server_addon/maya/client/ayon_maya/version.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py index 0331fb2fb6..701012f0fc 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -1,6 +1,6 @@ name = "maya" title = "Maya" -version = "0.2.1" +version = "0.2.2" ayon_required_addons = { "core": ">0.3.2", From 7d2948b1351687f6d7ff882ab68b4d631594a0aa Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:45:16 +0200 Subject: [PATCH 10/23] add version to max client addon class --- server_addon/max/client/ayon_max/__init__.py | 3 +++ server_addon/max/client/ayon_max/addon.py | 3 +++ server_addon/max/client/ayon_max/version.py | 3 +++ server_addon/max/package.py | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 server_addon/max/client/ayon_max/version.py diff --git a/server_addon/max/client/ayon_max/__init__.py b/server_addon/max/client/ayon_max/__init__.py index 9a5af8258c..77293f9aa9 100644 --- a/server_addon/max/client/ayon_max/__init__.py +++ b/server_addon/max/client/ayon_max/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( MaxAddon, MAX_HOST_DIR, @@ -5,6 +6,8 @@ from .addon import ( __all__ = ( + "__version__", + "MaxAddon", "MAX_HOST_DIR", ) diff --git a/server_addon/max/client/ayon_max/addon.py b/server_addon/max/client/ayon_max/addon.py index 12f5f7eca0..9cc0cda1ee 100644 --- a/server_addon/max/client/ayon_max/addon.py +++ b/server_addon/max/client/ayon_max/addon.py @@ -2,11 +2,14 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + MAX_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) class MaxAddon(AYONAddon, IHostAddon): name = "max" + version = __version__ host_name = "max" def add_implementation_envs(self, env, _app): diff --git a/server_addon/max/client/ayon_max/version.py b/server_addon/max/client/ayon_max/version.py new file mode 100644 index 0000000000..acb68bbdfc --- /dev/null +++ b/server_addon/max/client/ayon_max/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'max' version.""" +__version__ = "0.2.1" diff --git a/server_addon/max/package.py b/server_addon/max/package.py index ddd4e3b33e..09e86f8d50 100644 --- a/server_addon/max/package.py +++ b/server_addon/max/package.py @@ -1,6 +1,6 @@ name = "max" title = "Max" -version = "0.2.0" +version = "0.2.1" client_dir = "ayon_max" ayon_required_addons = { From 58f62d21aadd5c13f9f7a3526fafdd78dfbb4ac1 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:45:23 +0200 Subject: [PATCH 11/23] add version to nuke client addon class --- server_addon/nuke/client/ayon_nuke/__init__.py | 3 +++ server_addon/nuke/client/ayon_nuke/addon.py | 3 +++ server_addon/nuke/client/ayon_nuke/version.py | 3 +++ server_addon/nuke/package.py | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 server_addon/nuke/client/ayon_nuke/version.py diff --git a/server_addon/nuke/client/ayon_nuke/__init__.py b/server_addon/nuke/client/ayon_nuke/__init__.py index 8ab565939b..29ea039739 100644 --- a/server_addon/nuke/client/ayon_nuke/__init__.py +++ b/server_addon/nuke/client/ayon_nuke/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( NUKE_ROOT_DIR, NukeAddon, @@ -5,6 +6,8 @@ from .addon import ( __all__ = ( + "__version__", + "NUKE_ROOT_DIR", "NukeAddon", ) diff --git a/server_addon/nuke/client/ayon_nuke/addon.py b/server_addon/nuke/client/ayon_nuke/addon.py index 8e640624f0..ccb7379c0f 100644 --- a/server_addon/nuke/client/ayon_nuke/addon.py +++ b/server_addon/nuke/client/ayon_nuke/addon.py @@ -2,11 +2,14 @@ import os import platform from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + NUKE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) class NukeAddon(AYONAddon, IHostAddon): name = "nuke" + version = __version__ host_name = "nuke" def add_implementation_envs(self, env, _app): diff --git a/server_addon/nuke/client/ayon_nuke/version.py b/server_addon/nuke/client/ayon_nuke/version.py new file mode 100644 index 0000000000..1130392592 --- /dev/null +++ b/server_addon/nuke/client/ayon_nuke/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'nuke' version.""" +__version__ = "0.2.2" diff --git a/server_addon/nuke/package.py b/server_addon/nuke/package.py index 9e1f9362cb..9081205c44 100644 --- a/server_addon/nuke/package.py +++ b/server_addon/nuke/package.py @@ -1,6 +1,6 @@ name = "nuke" title = "Nuke" -version = "0.2.1" +version = "0.2.2" client_dir = "ayon_nuke" From 3142521caabc9f92320acece633fc4fd2580bc49 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:45:30 +0200 Subject: [PATCH 12/23] add version to houdini client addon class --- server_addon/houdini/client/ayon_houdini/__init__.py | 3 +++ server_addon/houdini/client/ayon_houdini/addon.py | 3 +++ server_addon/houdini/client/ayon_houdini/version.py | 2 +- server_addon/houdini/package.py | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server_addon/houdini/client/ayon_houdini/__init__.py b/server_addon/houdini/client/ayon_houdini/__init__.py index 38bf1fcc2d..afb51f7315 100644 --- a/server_addon/houdini/client/ayon_houdini/__init__.py +++ b/server_addon/houdini/client/ayon_houdini/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( HoudiniAddon, HOUDINI_HOST_DIR, @@ -5,6 +6,8 @@ from .addon import ( __all__ = ( + "__version__", + "HoudiniAddon", "HOUDINI_HOST_DIR", ) diff --git a/server_addon/houdini/client/ayon_houdini/addon.py b/server_addon/houdini/client/ayon_houdini/addon.py index 95d714aea1..4c23553008 100644 --- a/server_addon/houdini/client/ayon_houdini/addon.py +++ b/server_addon/houdini/client/ayon_houdini/addon.py @@ -1,11 +1,14 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + HOUDINI_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) class HoudiniAddon(AYONAddon, IHostAddon): name = "houdini" + version = __version__ host_name = "houdini" def add_implementation_envs(self, env, _app): diff --git a/server_addon/houdini/client/ayon_houdini/version.py b/server_addon/houdini/client/ayon_houdini/version.py index 1b06708904..87d445d563 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.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 811bb5de651ef37749ac181683af13a24de88753 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:45:39 +0200 Subject: [PATCH 13/23] add version to substance painter client addon class --- .../substancepainter/client/ayon_substancepainter/__init__.py | 3 +++ .../substancepainter/client/ayon_substancepainter/addon.py | 3 +++ .../substancepainter/client/ayon_substancepainter/version.py | 3 +++ server_addon/substancepainter/package.py | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 server_addon/substancepainter/client/ayon_substancepainter/version.py diff --git a/server_addon/substancepainter/client/ayon_substancepainter/__init__.py b/server_addon/substancepainter/client/ayon_substancepainter/__init__.py index 4c33b9f507..5627134cbd 100644 --- a/server_addon/substancepainter/client/ayon_substancepainter/__init__.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( SubstanceAddon, SUBSTANCE_HOST_DIR, @@ -5,6 +6,8 @@ from .addon import ( __all__ = ( + "__version__", + "SubstanceAddon", "SUBSTANCE_HOST_DIR" ) diff --git a/server_addon/substancepainter/client/ayon_substancepainter/addon.py b/server_addon/substancepainter/client/ayon_substancepainter/addon.py index 26829d3153..971b25a1bd 100644 --- a/server_addon/substancepainter/client/ayon_substancepainter/addon.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/addon.py @@ -1,11 +1,14 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + SUBSTANCE_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) class SubstanceAddon(AYONAddon, IHostAddon): name = "substancepainter" + version = __version__ host_name = "substancepainter" def add_implementation_envs(self, env, _app): diff --git a/server_addon/substancepainter/client/ayon_substancepainter/version.py b/server_addon/substancepainter/client/ayon_substancepainter/version.py new file mode 100644 index 0000000000..d8e2b13996 --- /dev/null +++ b/server_addon/substancepainter/client/ayon_substancepainter/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'substancepainter' version.""" +__version__ = "0.2.1" diff --git a/server_addon/substancepainter/package.py b/server_addon/substancepainter/package.py index 4db5ef634f..8ffad08b27 100644 --- a/server_addon/substancepainter/package.py +++ b/server_addon/substancepainter/package.py @@ -1,6 +1,6 @@ name = "substancepainter" title = "Substance Painter" -version = "0.2.0" +version = "0.2.1" client_dir = "ayon_substancepainter" From cdd3919c09dd48944aad2fff5eda13c196ab5d8a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:45:49 +0200 Subject: [PATCH 14/23] add version to traypublisher client addon class --- .../traypublisher/client/ayon_traypublisher/__init__.py | 3 +++ server_addon/traypublisher/client/ayon_traypublisher/addon.py | 3 +++ .../traypublisher/client/ayon_traypublisher/version.py | 3 +++ server_addon/traypublisher/package.py | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 server_addon/traypublisher/client/ayon_traypublisher/version.py diff --git a/server_addon/traypublisher/client/ayon_traypublisher/__init__.py b/server_addon/traypublisher/client/ayon_traypublisher/__init__.py index 77ba908ddd..52a433b5e1 100644 --- a/server_addon/traypublisher/client/ayon_traypublisher/__init__.py +++ b/server_addon/traypublisher/client/ayon_traypublisher/__init__.py @@ -1,6 +1,9 @@ +from .version import __version__ from .addon import TrayPublishAddon __all__ = ( + "__version__", + "TrayPublishAddon", ) diff --git a/server_addon/traypublisher/client/ayon_traypublisher/addon.py b/server_addon/traypublisher/client/ayon_traypublisher/addon.py index 5432cb1a92..dd78a70b59 100644 --- a/server_addon/traypublisher/client/ayon_traypublisher/addon.py +++ b/server_addon/traypublisher/client/ayon_traypublisher/addon.py @@ -10,12 +10,15 @@ from ayon_core.addon import ( IHostAddon, ) +from .version import __version__ + TRAYPUBLISH_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) class TrayPublishAddon(AYONAddon, IHostAddon, ITrayAction): label = "Publisher" name = "traypublisher" + version = __version__ host_name = "traypublisher" def initialize(self, settings): diff --git a/server_addon/traypublisher/client/ayon_traypublisher/version.py b/server_addon/traypublisher/client/ayon_traypublisher/version.py new file mode 100644 index 0000000000..01f2ad4f1d --- /dev/null +++ b/server_addon/traypublisher/client/ayon_traypublisher/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'traypublisher' version.""" +__version__ = "0.2.2" diff --git a/server_addon/traypublisher/package.py b/server_addon/traypublisher/package.py index c9b94c2b72..85611526d0 100644 --- a/server_addon/traypublisher/package.py +++ b/server_addon/traypublisher/package.py @@ -1,6 +1,6 @@ name = "traypublisher" title = "TrayPublisher" -version = "0.2.1" +version = "0.2.2" client_dir = "ayon_traypublisher" From f6529ea0e7176d499f259cad0ea2664d4b77e42a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:56:53 +0200 Subject: [PATCH 15/23] move timers managers client code next to server codebase --- .../timers_manager/client/ayon_timers_manager}/__init__.py | 0 .../timers_manager/client/ayon_timers_manager}/exceptions.py | 0 .../timers_manager/client/ayon_timers_manager}/idle_threads.py | 0 .../client/ayon_timers_manager}/launch_hooks/post_start_timer.py | 0 .../client/ayon_timers_manager}/plugins/publish/start_timer.py | 0 .../client/ayon_timers_manager}/plugins/publish/stop_timer.py | 0 .../timers_manager/client/ayon_timers_manager}/rest_api.py | 0 .../timers_manager/client/ayon_timers_manager}/timers_manager.py | 0 .../timers_manager/client/ayon_timers_manager}/version.py | 0 .../client/ayon_timers_manager}/widget_user_idle.py | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/__init__.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/exceptions.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/idle_threads.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/launch_hooks/post_start_timer.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/plugins/publish/start_timer.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/plugins/publish/stop_timer.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/rest_api.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/timers_manager.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/version.py (100%) rename {client/ayon_core/modules/timers_manager => server_addon/timers_manager/client/ayon_timers_manager}/widget_user_idle.py (100%) diff --git a/client/ayon_core/modules/timers_manager/__init__.py b/server_addon/timers_manager/client/ayon_timers_manager/__init__.py similarity index 100% rename from client/ayon_core/modules/timers_manager/__init__.py rename to server_addon/timers_manager/client/ayon_timers_manager/__init__.py diff --git a/client/ayon_core/modules/timers_manager/exceptions.py b/server_addon/timers_manager/client/ayon_timers_manager/exceptions.py similarity index 100% rename from client/ayon_core/modules/timers_manager/exceptions.py rename to server_addon/timers_manager/client/ayon_timers_manager/exceptions.py diff --git a/client/ayon_core/modules/timers_manager/idle_threads.py b/server_addon/timers_manager/client/ayon_timers_manager/idle_threads.py similarity index 100% rename from client/ayon_core/modules/timers_manager/idle_threads.py rename to server_addon/timers_manager/client/ayon_timers_manager/idle_threads.py diff --git a/client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py b/server_addon/timers_manager/client/ayon_timers_manager/launch_hooks/post_start_timer.py similarity index 100% rename from client/ayon_core/modules/timers_manager/launch_hooks/post_start_timer.py rename to server_addon/timers_manager/client/ayon_timers_manager/launch_hooks/post_start_timer.py diff --git a/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py b/server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/start_timer.py similarity index 100% rename from client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py rename to server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/start_timer.py diff --git a/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py b/server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/stop_timer.py similarity index 100% rename from client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py rename to server_addon/timers_manager/client/ayon_timers_manager/plugins/publish/stop_timer.py diff --git a/client/ayon_core/modules/timers_manager/rest_api.py b/server_addon/timers_manager/client/ayon_timers_manager/rest_api.py similarity index 100% rename from client/ayon_core/modules/timers_manager/rest_api.py rename to server_addon/timers_manager/client/ayon_timers_manager/rest_api.py diff --git a/client/ayon_core/modules/timers_manager/timers_manager.py b/server_addon/timers_manager/client/ayon_timers_manager/timers_manager.py similarity index 100% rename from client/ayon_core/modules/timers_manager/timers_manager.py rename to server_addon/timers_manager/client/ayon_timers_manager/timers_manager.py diff --git a/client/ayon_core/modules/timers_manager/version.py b/server_addon/timers_manager/client/ayon_timers_manager/version.py similarity index 100% rename from client/ayon_core/modules/timers_manager/version.py rename to server_addon/timers_manager/client/ayon_timers_manager/version.py diff --git a/client/ayon_core/modules/timers_manager/widget_user_idle.py b/server_addon/timers_manager/client/ayon_timers_manager/widget_user_idle.py similarity index 100% rename from client/ayon_core/modules/timers_manager/widget_user_idle.py rename to server_addon/timers_manager/client/ayon_timers_manager/widget_user_idle.py From b05062474a02a99b0c78499ddd8f5f47eba901f6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:59:22 +0200 Subject: [PATCH 16/23] update package.py and bump version --- .../timers_manager/client/ayon_timers_manager/version.py | 4 +++- server_addon/timers_manager/package.py | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server_addon/timers_manager/client/ayon_timers_manager/version.py b/server_addon/timers_manager/client/ayon_timers_manager/version.py index 485f44ac21..95e413aaac 100644 --- a/server_addon/timers_manager/client/ayon_timers_manager/version.py +++ b/server_addon/timers_manager/client/ayon_timers_manager/version.py @@ -1 +1,3 @@ -__version__ = "0.1.1" +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'timers_manager' version.""" +__version__ = "0.2.0" diff --git a/server_addon/timers_manager/package.py b/server_addon/timers_manager/package.py index bd6b81b4b7..32dc7cfbf4 100644 --- a/server_addon/timers_manager/package.py +++ b/server_addon/timers_manager/package.py @@ -1,3 +1,10 @@ name = "timers_manager" title = "Timers Manager" -version = "0.1.1" +version = "0.2.0" + +client_dir = "ayon_timers_manager" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} From 426f057a7d19b362d3ee1e69771f9e59b5d01537 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:02:56 +0200 Subject: [PATCH 17/23] move pynput dependency to timers manager --- client/pyproject.toml | 1 - server_addon/timers_manager/client/pyproject.toml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 server_addon/timers_manager/client/pyproject.toml diff --git a/client/pyproject.toml b/client/pyproject.toml index 5e811321f8..1502106f82 100644 --- a/client/pyproject.toml +++ b/client/pyproject.toml @@ -19,4 +19,3 @@ Click = "^8" OpenTimelineIO = "0.16.0" opencolorio = "2.2.1" Pillow = "9.5.0" -pynput = "^1.7.2" # Timers manager - TODO remove diff --git a/server_addon/timers_manager/client/pyproject.toml b/server_addon/timers_manager/client/pyproject.toml new file mode 100644 index 0000000000..364fb33712 --- /dev/null +++ b/server_addon/timers_manager/client/pyproject.toml @@ -0,0 +1,6 @@ +[project] +name="timers_manager" +description="AYON TimersManager addon." + +[ayon.runtimeDependencies] +pynput = "^1.7.2" \ No newline at end of file From 02e90bf4a55e304fef4f51c642fc7c51784643c6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:17:56 +0200 Subject: [PATCH 18/23] remove 'wsrpc_aiohttp' from core pyproject toml --- client/pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/client/pyproject.toml b/client/pyproject.toml index 5e811321f8..e9885af735 100644 --- a/client/pyproject.toml +++ b/client/pyproject.toml @@ -14,7 +14,6 @@ qtawesome = "0.7.3" [ayon.runtimeDependencies] aiohttp_json_rpc = "*" # TVPaint server aiohttp-middlewares = "^2.0.0" -wsrpc_aiohttp = "^3.1.1" # websocket server Click = "^8" OpenTimelineIO = "0.16.0" opencolorio = "2.2.1" From fc86a1f4cd939deb3623331862cf6c7c7535f8ff Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:32:33 +0200 Subject: [PATCH 19/23] added timers manager milestone --- client/ayon_core/addon/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index 56298e0d06..8a23c1a5d7 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -61,6 +61,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = { "hiero": VersionInfo(0, 2, 0), "max": VersionInfo(0, 2, 0), "photoshop": VersionInfo(0, 2, 0), + "timers_manager": VersionInfo(0, 2, 0), "traypublisher": VersionInfo(0, 2, 0), "tvpaint": VersionInfo(0, 2, 0), "maya": VersionInfo(0, 2, 0), From d00c3cba768f133f5decc33227fa669c999e6ba4 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:38:53 +0200 Subject: [PATCH 20/23] bump version of changed addons --- server_addon/photoshop/client/ayon_photoshop/version.py | 2 +- server_addon/photoshop/package.py | 2 +- server_addon/royalrender/client/ayon_royalrender/version.py | 2 +- server_addon/royalrender/package.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server_addon/photoshop/client/ayon_photoshop/version.py b/server_addon/photoshop/client/ayon_photoshop/version.py index 31a969addf..7f6de51228 100644 --- a/server_addon/photoshop/client/ayon_photoshop/version.py +++ b/server_addon/photoshop/client/ayon_photoshop/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'photoshop' version.""" -__version__ = "0.2.1" +__version__ = "0.2.2" diff --git a/server_addon/photoshop/package.py b/server_addon/photoshop/package.py index d04973ebc3..f4d2a98293 100644 --- a/server_addon/photoshop/package.py +++ b/server_addon/photoshop/package.py @@ -1,6 +1,6 @@ name = "photoshop" title = "Photoshop" -version = "0.2.1" +version = "0.2.2" client_dir = "ayon_photoshop" diff --git a/server_addon/royalrender/client/ayon_royalrender/version.py b/server_addon/royalrender/client/ayon_royalrender/version.py index 4528939205..d1eafe6568 100644 --- a/server_addon/royalrender/client/ayon_royalrender/version.py +++ b/server_addon/royalrender/client/ayon_royalrender/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'royalrender' version.""" -__version__ = "0.2.0" +__version__ = "0.2.1" diff --git a/server_addon/royalrender/package.py b/server_addon/royalrender/package.py index 2a07b59f65..781445c4ad 100644 --- a/server_addon/royalrender/package.py +++ b/server_addon/royalrender/package.py @@ -1,6 +1,6 @@ name = "royalrender" title = "Royal Render" -version = "0.2.0" +version = "0.2.1" client_dir = "ayon_royalrender" From 171b2927a8570db951f05b8324ef175b07b33b42 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:27:03 +0200 Subject: [PATCH 21/23] fix creation of packages --- server_addon/applications/package.py | 2 ++ server_addon/maya/package.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/server_addon/applications/package.py b/server_addon/applications/package.py index a95acad345..436c283791 100644 --- a/server_addon/applications/package.py +++ b/server_addon/applications/package.py @@ -2,6 +2,8 @@ name = "applications" title = "Applications" version = "0.2.3" +client_dir = "ayon_applications" + ayon_server_version = ">=1.0.7" ayon_launcher_version = ">=1.0.2" ayon_required_addons = { diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py index 701012f0fc..cc575ec4db 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -2,6 +2,8 @@ name = "maya" title = "Maya" version = "0.2.2" +client_dir = "ayon_maya" + ayon_required_addons = { "core": ">0.3.2", } From 299fee2eed268a373c84e0e8e0023c192ac0c15a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:27:03 +0200 Subject: [PATCH 22/23] fix creation of packages --- server_addon/applications/package.py | 2 ++ server_addon/maya/package.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/server_addon/applications/package.py b/server_addon/applications/package.py index 983749355e..029eed82b2 100644 --- a/server_addon/applications/package.py +++ b/server_addon/applications/package.py @@ -2,6 +2,8 @@ name = "applications" title = "Applications" version = "0.2.2" +client_dir = "ayon_applications" + ayon_server_version = ">=1.0.7" ayon_launcher_version = ">=1.0.2" ayon_required_addons = { diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py index 0331fb2fb6..6575cc2dbf 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -2,6 +2,8 @@ name = "maya" title = "Maya" version = "0.2.1" +client_dir = "ayon_maya" + ayon_required_addons = { "core": ">0.3.2", } From d70c78ad3dff02d685a1c5ad44d5a75906f13b59 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:47:48 +0200 Subject: [PATCH 23/23] removed duplicated attribute --- server_addon/applications/package.py | 2 -- server_addon/maya/package.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/server_addon/applications/package.py b/server_addon/applications/package.py index 7468068c88..436c283791 100644 --- a/server_addon/applications/package.py +++ b/server_addon/applications/package.py @@ -4,8 +4,6 @@ version = "0.2.3" client_dir = "ayon_applications" -client_dir = "ayon_applications" - ayon_server_version = ">=1.0.7" ayon_launcher_version = ">=1.0.2" ayon_required_addons = { diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py index 0c66ab0e02..627e824413 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -1,9 +1,6 @@ name = "maya" title = "Maya" version = "0.2.2" - -client_dir = "ayon_maya" - client_dir = "ayon_maya" ayon_required_addons = {