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 diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index 56298e0d06..53f64eef8b 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -37,14 +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 # - this is used to log the missing addon @@ -61,6 +54,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), @@ -419,12 +413,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(( @@ -433,10 +421,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 @@ -502,9 +489,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" diff --git a/client/ayon_core/modules/timers_manager/version.py b/client/ayon_core/modules/timers_manager/version.py deleted file mode 100644 index 485f44ac21..0000000000 --- a/client/ayon_core/modules/timers_manager/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "0.1.1" diff --git a/client/pyproject.toml b/client/pyproject.toml index fee7b2fd71..72e5dd2794 100644 --- a/client/pyproject.toml +++ b/client/pyproject.toml @@ -13,9 +13,7 @@ qtawesome = "0.7.3" [ayon.runtimeDependencies] aiohttp-middlewares = "^2.0.0" -wsrpc_aiohttp = "^3.1.1" # websocket server 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/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..436c283791 100644 --- a/server_addon/applications/package.py +++ b/server_addon/applications/package.py @@ -1,6 +1,8 @@ name = "applications" title = "Applications" -version = "0.2.2" +version = "0.2.3" + +client_dir = "ayon_applications" ayon_server_version = ">=1.0.7" ayon_launcher_version = ">=1.0.2" 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 = { 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" 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 = { 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..627e824413 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -1,6 +1,7 @@ name = "maya" title = "Maya" -version = "0.2.1" +version = "0.2.2" +client_dir = "ayon_maya" ayon_required_addons = { "core": ">0.3.2", 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" 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 ) 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/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): 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" 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" 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/server_addon/timers_manager/client/ayon_timers_manager/version.py b/server_addon/timers_manager/client/ayon_timers_manager/version.py new file mode 100644 index 0000000000..95e413aaac --- /dev/null +++ b/server_addon/timers_manager/client/ayon_timers_manager/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'timers_manager' version.""" +__version__ = "0.2.0" 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 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 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 = {} 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"