Merge branch 'develop' of https://github.com/ynput/ayon-core into bugfix/AY-5647_Enabled-toggle-is-ignored-in-RoyalRender

client/ayon_core/addon/base.py

@@ -65,6 +65,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = {
     "maya": VersionInfo(0, 2, 0),
     "nuke": VersionInfo(0, 2, 0),
     "resolve": VersionInfo(0, 2, 0),
+    "royalrender": VersionInfo(0, 2, 0),
     "substancepainter": VersionInfo(0, 2, 0),
     "houdini": VersionInfo(0, 3, 0),
 }

client/ayon_core/modules/royalrender/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.1"

server_addon/royalrender/client/ayon_royalrender/lib.py

@@ -16,8 +16,8 @@ from ayon_core.lib import (
     is_in_tests,
 )
 from ayon_core.lib.execute import run_ayon_launcher_process
-from ayon_core.modules.royalrender.api import Api as rrApi
-from ayon_core.modules.royalrender.rr_job import (
+from ayon_royalrender.api import Api as rrApi
+from ayon_royalrender.rr_job import (
     CustomAttribute,
     RRJob,
     RREnvList,

server_addon/royalrender/client/ayon_royalrender/plugins/publish/collect_rr_path_from_instance.py

@@ -8,7 +8,7 @@ Provides:
 import os.path
 
 import pyblish.api
-from ayon_core.modules.royalrender.rr_job import get_rr_platform
+from ayon_royalrender.rr_job import get_rr_platform
 
 
 class CollectRRPathFromInstance(pyblish.api.InstancePlugin):

server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_maya_royalrender_job.py

@@ -4,7 +4,7 @@ import os
 
 from maya.OpenMaya import MGlobal  # noqa: F401
 
-from ayon_core.modules.royalrender import lib
+from ayon_royalrender import lib
 from ayon_core.pipeline.farm.tools import iter_expected_files
 
 

server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_nuke_royalrender_job.py

@@ -2,7 +2,7 @@
 """Submitting render job to RoyalRender."""
 import re
 
-from ayon_core.modules.royalrender import lib
+from ayon_royalrender import lib
 
 
 class CreateNukeRoyalRenderJob(lib.BaseCreateRoyalRenderJob):

server_addon/royalrender/client/ayon_royalrender/plugins/publish/create_publish_royalrender_job.py

@@ -6,7 +6,7 @@ import json
 
 import pyblish.api
 
-from ayon_core.modules.royalrender.rr_job import (
+from ayon_royalrender.rr_job import (
     RRJob,
     RREnvList,
     get_rr_platform

server_addon/royalrender/client/ayon_royalrender/plugins/publish/submit_jobs_to_royalrender.py

@@ -3,7 +3,7 @@
 import tempfile
 
 import pyblish.api
-from ayon_core.modules.royalrender.api import (
+from ayon_royalrender.api import (
     RRJob,
     Api as rrApi,
     SubmitterParameter

server_addon/royalrender/client/ayon_royalrender/version.py

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

server_addon/royalrender/package.py

@@ -1,3 +1,10 @@
 name = "royalrender"
 title = "Royal Render"
-version = "0.1.1"
+version = "0.2.0"
+
+client_dir = "ayon_royalrender"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}