Merge branch 'develop' into enhancement/AY-4913_Move-Fusion-client-code

server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_color_coded_instances.py

@@ -33,6 +33,7 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
     targets = ["automated"]
+    settings_category = "photoshop"
 
     # configurable by Settings
     color_code_mapping = []

server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_review.py

@@ -16,6 +16,7 @@ class CollectReview(pyblish.api.ContextPlugin):
     label = "Collect Review"
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.1
+    settings_category = "photoshop"
 
     def process(self, context):
         for instance in context:

server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_version.py

@@ -22,6 +22,7 @@ class CollectVersion(pyblish.api.InstancePlugin):
 
     hosts = ["photoshop"]
     families = ["image", "review", "workfile"]
+    settings_category = "photoshop"
 
     def process(self, instance):
         workfile_version = instance.context.data["version"]

server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_image.py

@@ -22,6 +22,7 @@ class ExtractImage(pyblish.api.ContextPlugin):
 
     families = ["image", "background"]
     formats = ["png", "jpg"]
+    settings_category = "photoshop"
 
     def process(self, context):
         stub = photoshop.stub()

server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_review.py

@@ -29,6 +29,7 @@ class ExtractReview(publish.Extractor):
     label = "Extract Review"
     hosts = ["photoshop"]
     families = ["review"]
+    settings_category = "photoshop"
 
     # Extract Options
     jpg_options = None

server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_naming.py

@@ -16,6 +16,7 @@ class ValidateNamingRepair(pyblish.api.Action):
     label = "Repair"
     icon = "wrench"
     on = "failed"
+    settings_category = "photoshop"
 
     def process(self, context, plugin):
 

server_addon/photoshop/client/ayon_photoshop/version.py

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

server_addon/photoshop/package.py

@@ -1,6 +1,6 @@
 name = "photoshop"
 title = "Photoshop"
-version = "0.2.0"
+version = "0.2.1"
 
 client_dir = "ayon_photoshop"
 

server_addon/tvpaint/client/ayon_tvpaint/__init__.py

@@ -1,3 +1,4 @@
+from .version import __version__
 from .addon import (
     get_launch_script_path,
     TVPaintAddon,
@@ -6,6 +7,8 @@ from .addon import (
 
 
 __all__ = (
+    "__version__",
+
     "get_launch_script_path",
     "TVPaintAddon",
     "TVPAINT_ROOT_DIR",

server_addon/tvpaint/client/ayon_tvpaint/addon.py

@@ -1,6 +1,8 @@
 import os
 from ayon_core.addon import AYONAddon, IHostAddon
 
+from .version import __version__
+
 TVPAINT_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -14,6 +16,7 @@ def get_launch_script_path():
 
 class TVPaintAddon(AYONAddon, IHostAddon):
     name = "tvpaint"
+    version = __version__
     host_name = "tvpaint"
 
     def add_implementation_envs(self, env, _app):

server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py

@@ -8,6 +8,7 @@ class ImportImage(plugin.Loader):
 
     product_types = {"render", "image", "background", "plate", "review"}
     representations = {"*"}
+    settings_category = "tvpaint"
 
     label = "Import Image"
     order = 1

server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py

@@ -19,6 +19,7 @@ class LoadImage(plugin.Loader):
 
     product_types = {"render", "image", "background", "plate", "review"}
     representations = {"*"}
+    settings_category = "tvpaint"
 
     label = "Load Image"
     order = 1

server_addon/tvpaint/client/ayon_tvpaint/version.py

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

server_addon/tvpaint/package.py

@@ -1,6 +1,6 @@
 name = "tvpaint"
 title = "TVPaint"
-version = "0.2.0"
+version = "0.2.1"
 client_dir = "ayon_tvpaint"
 
 ayon_required_addons = {

server_addon/tvpaint/pyproject.toml

@@ -0,0 +1,6 @@
+[project]
+name="tvpaint"
+description="AYON TVPaint addon."
+
+[ayon.runtimeDependencies]
+aiohttp_json_rpc = "*"