Merge pull request #565 from ynput/enhancement/AY-4911_Move-Celaction-client-code

Chore: Move celaction client code

client/ayon_core/addon/base.py

@@ -51,6 +51,7 @@ IGNORED_MODULES_IN_AYON = set()
 # - this is used to log the missing addon
 MOVED_ADDON_MILESTONE_VERSIONS = {
     "applications": VersionInfo(0, 2, 0),
+    "celaction": VersionInfo(0, 2, 0),
     "clockify": VersionInfo(0, 2, 0),
     "traypublisher": VersionInfo(0, 2, 0),
     "tvpaint": VersionInfo(0, 2, 0),

server_addon/celaction/client/ayon_celaction/__init__.py

@@ -1,3 +1,4 @@
+from .version import __version__
 from .addon import (
     CELACTION_ROOT_DIR,
     CelactionAddon,
@@ -5,6 +6,8 @@ from .addon import (
 
 
 __all__ = (
+    "__version__",
+
     "CELACTION_ROOT_DIR",
     "CelactionAddon",
 )

server_addon/celaction/client/ayon_celaction/addon.py

@@ -1,11 +1,14 @@
 import os
 from ayon_core.addon import AYONAddon, IHostAddon
 
+from .version import __version__
+
 CELACTION_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class CelactionAddon(AYONAddon, IHostAddon):
     name = "celaction"
+    version = __version__
     host_name = "celaction"
 
     def get_launch_hook_paths(self, app):

server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py

@@ -4,13 +4,11 @@ import winreg
 import subprocess
 from ayon_core.lib import get_ayon_launcher_args
 from ayon_applications import PreLaunchHook, LaunchTypes
-from ayon_core.hosts.celaction import CELACTION_ROOT_DIR
+from ayon_celaction import CELACTION_ROOT_DIR
 
 
 class CelactionPrelaunchHook(PreLaunchHook):
-    """
-    Bootstrap celacion with pype
-    """
+    """Bootstrap celacion with AYON"""
     app_groups = {"celaction"}
     platforms = {"windows"}
     launch_types = {LaunchTypes.local}
@@ -39,7 +37,7 @@ class CelactionPrelaunchHook(PreLaunchHook):
             CELACTION_ROOT_DIR, "scripts", "publish_cli.py"
         )
         subprocess_args = get_ayon_launcher_args("run", path_to_cli)
-        openpype_executable = subprocess_args.pop(0)
+        executable = subprocess_args.pop(0)
         workfile_settings = self.get_workfile_settings()
 
         winreg.SetValueEx(
@@ -47,7 +45,7 @@ class CelactionPrelaunchHook(PreLaunchHook):
             "SubmitAppTitle",
             0,
             winreg.REG_SZ,
-            openpype_executable
+            executable
         )
 
         # add required arguments for workfile path

server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py

@@ -1,6 +1,6 @@
 import os
-import pyblish.api
 import copy
+import pyblish.api
 
 
 class CollectRenderPath(pyblish.api.InstancePlugin):
@@ -10,6 +10,8 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
     order = pyblish.api.CollectorOrder + 0.495
     families = ["render.farm"]
 
+    settings_category = "celaction"
+
     # Presets
     output_extension = "png"
     anatomy_template_key_render_files = None

server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py

@@ -4,7 +4,7 @@ import sys
 import pyblish.api
 import pyblish.util
 
-import ayon_core.hosts.celaction
+from ayon_celaction import CELACTION_ROOT_DIR
 from ayon_core.lib import Logger
 from ayon_core.tools.utils import host_tools
 from ayon_core.pipeline import install_ayon_plugins
@@ -13,13 +13,12 @@ from ayon_core.pipeline import install_ayon_plugins
 log = Logger.get_logger("celaction")
 
 PUBLISH_HOST = "celaction"
-HOST_DIR = os.path.dirname(os.path.abspath(ayon_core.hosts.celaction.__file__))
-PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
+PLUGINS_DIR = os.path.join(CELACTION_ROOT_DIR, "plugins")
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
 
 
 def main():
-    # Registers pype's Global pyblish plugins
+    # Registers global pyblish plugins
     install_ayon_plugins()
 
     if os.path.exists(PUBLISH_PATH):

server_addon/celaction/client/ayon_celaction/version.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+"""Package declaring AYON addon 'celaction' version."""
+__version__ = "0.2.0"

server_addon/celaction/package.py

@@ -1,3 +1,12 @@
 name = "celaction"
 title = "CelAction"
-version = "0.1.0"
+version = "0.2.0"
+
+client_dir = "ayon_celaction"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {
+    "applications": ">=0.2.0",
+}