Merge branch 'develop' into enhancement/OP-8218_Loader-OTIO-export-action

client/ayon_core/hosts/aftereffects/api/launch_logic.py

@@ -15,8 +15,7 @@ from wsrpc_aiohttp import (
 
 from qtpy import QtCore
 
-from ayon_core.lib import Logger
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import Logger, is_in_tests
 from ayon_core.pipeline import install_host
 from ayon_core.addon import AddonsManager
 from ayon_core.tools.utils import host_tools, get_ayon_qt_app

client/ayon_core/hosts/harmony/api/README.md

@@ -52,7 +52,7 @@ Because Harmony projects are directories, this integration uses `.zip` as work f
 
 ### Show Workfiles on launch
 
-You can show the Workfiles app when Harmony launches by setting environment variable `AVALON_HARMONY_WORKFILES_ON_LAUNCH=1`.
+You can show the Workfiles app when Harmony launches by setting environment variable `AYON_HARMONY_WORKFILES_ON_LAUNCH=1`.
 
 ## Developing
 

client/ayon_core/hosts/harmony/api/TB_sceneOpened.js

@@ -349,7 +349,7 @@ function start() {
     /** hostname or ip of server - should be localhost */
     var host = '127.0.0.1';
     /** port of the server */
-    var port = parseInt(System.getenv('AVALON_HARMONY_PORT'));
+    var port = parseInt(System.getenv('AYON_HARMONY_PORT'));
 
     // Attach the client to the QApplication to preserve.
     var app = QCoreApplication.instance();

client/ayon_core/hosts/harmony/api/lib.py

@@ -189,14 +189,14 @@ def launch(application_path, *args):
     install_host(harmony)
 
     ProcessContext.port = random.randrange(49152, 65535)
-    os.environ["AVALON_HARMONY_PORT"] = str(ProcessContext.port)
+    os.environ["AYON_HARMONY_PORT"] = str(ProcessContext.port)
     ProcessContext.application_path = application_path
 
     # Launch Harmony.
     setup_startup_scripts()
     check_libs()
 
-    if not os.environ.get("AVALON_HARMONY_WORKFILES_ON_LAUNCH", False):
+    if not os.environ.get("AYON_HARMONY_WORKFILES_ON_LAUNCH", False):
         open_empty_workfile()
         return
 

client/ayon_core/hosts/photoshop/api/lib.py

@@ -3,12 +3,11 @@ import sys
 import contextlib
 import traceback
 
-from ayon_core.lib import env_value_to_bool, Logger
+from ayon_core.lib import env_value_to_bool, Logger, is_in_tests
 from ayon_core.addon import AddonsManager
 from ayon_core.pipeline import install_host
 from ayon_core.tools.utils import host_tools
 from ayon_core.tools.utils import get_ayon_qt_app
-from ayon_core.tests.lib import is_in_tests
 
 from .launch_logic import ProcessLauncher, stub
 

client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py

@@ -21,7 +21,7 @@ from openpype_modules.webpublisher.lib import (
     get_batch_asset_task_info,
     parse_json
 )
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import is_in_tests
 
 
 class CollectBatchData(pyblish.api.ContextPlugin):

client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py

@@ -3,10 +3,9 @@ import re
 
 import pyblish.api
 
-from ayon_core.lib import prepare_template_data
+from ayon_core.lib import prepare_template_data, is_in_tests
 from ayon_core.hosts.photoshop import api as photoshop
 from ayon_core.settings import get_project_settings
-from ayon_core.tests.lib import is_in_tests
 
 
 class CollectColorCodedInstances(pyblish.api.ContextPlugin):

client/ayon_core/lib/__init__.py

@@ -158,6 +158,7 @@ from .ayon_info import (
     is_running_from_build,
     is_staging_enabled,
     is_dev_mode_enabled,
+    is_in_tests,
 )
 
 
@@ -229,6 +230,8 @@ __all__ = [
 
     "IniSettingRegistry",
     "JSONSettingRegistry",
+    "AYONSecureRegistry",
+    "AYONSettingsRegistry",
     "OpenPypeSecureRegistry",
     "OpenPypeSettingsRegistry",
     "get_local_site_id",
@@ -271,6 +274,7 @@ __all__ = [
     "terminal",
 
     "get_datetime_data",
+    "get_timestamp",
     "get_formatted_current_time",
 
     "Logger",
@@ -278,6 +282,7 @@ __all__ = [
     "is_running_from_build",
     "is_staging_enabled",
     "is_dev_mode_enabled",
+    "is_in_tests",
 
     "requests_get",
     "requests_post"

client/ayon_core/lib/ayon_info.py

@@ -38,6 +38,16 @@ def is_staging_enabled():
     return os.getenv("AYON_USE_STAGING") == "1"
 
 
+def is_in_tests():
+    """Process is running in automatic tests mode.
+
+    Returns:
+        bool: True if running in tests.
+
+    """
+    return os.environ.get("AYON_IN_TESTS") == "1"
+
+
 def is_dev_mode_enabled():
     """Dev mode is enabled in AYON.
 

client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py

@@ -7,10 +7,10 @@ from datetime import datetime
 from ayon_core.lib import (
     env_value_to_bool,
     collect_frames,
+    is_in_tests,
 )
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
-from ayon_core.tests.lib import is_in_tests
 
 
 @attr.s

client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py

@@ -10,10 +10,10 @@ from ayon_core.lib import (
     BoolDef,
     NumberDef,
     TextDef,
+    is_in_tests,
 )
 from ayon_core.pipeline.publish import AYONPyblishPluginMixin
 from ayon_core.pipeline.farm.tools import iter_expected_files
-from ayon_core.tests.lib import is_in_tests
 
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo

client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py

@@ -12,7 +12,7 @@ import pyblish.api
 
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import is_in_tests
 
 
 class _ZipFile(ZipFile):

client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py

@@ -7,11 +7,11 @@ import pyblish.api
 from ayon_core.lib import (
     TextDef,
     NumberDef,
+    is_in_tests,
 )
 from ayon_core.pipeline import (
     AYONPyblishPluginMixin
 )
-from ayon_core.tests.lib import is_in_tests
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
 

client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py

@@ -6,10 +6,10 @@ from datetime import datetime
 import pyblish.api
 
 from ayon_core.pipeline import AYONPyblishPluginMixin
-from ayon_core.tests.lib import is_in_tests
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
 from ayon_core.lib import (
+    is_in_tests,
     BoolDef,
     NumberDef
 )

client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py

@@ -35,14 +35,14 @@ from ayon_core.lib import (
     BoolDef,
     NumberDef,
     TextDef,
-    EnumDef
+    EnumDef,
+    is_in_tests,
 )
 from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings
 from ayon_core.hosts.maya.api.lib import get_attr_in_layer
 
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
-from ayon_core.tests.lib import is_in_tests
 from ayon_core.pipeline.farm.tools import iter_expected_files
 
 

client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py

@@ -3,7 +3,7 @@ import attr
 from datetime import datetime
 
 from ayon_core.pipeline import PublishXmlValidationError
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import is_in_tests
 from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
 

client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py

@@ -10,8 +10,8 @@ import pyblish.api
 from ayon_core.pipeline.publish import (
     AYONPyblishPluginMixin
 )
-from ayon_core.tests.lib import is_in_tests
 from ayon_core.lib import (
+    is_in_tests,
     BoolDef,
     NumberDef
 )

client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py

@@ -12,8 +12,7 @@ from ayon_core.client import (
     get_last_version_by_subset_name,
 )
 from ayon_core.pipeline import publish
-from ayon_core.lib import EnumDef
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import EnumDef, is_in_tests
 from ayon_core.pipeline.version_start import get_versioning_start
 
 from ayon_core.pipeline.farm.pyblish_functions import (

client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py

@@ -13,8 +13,7 @@ from ayon_core.client import (
     get_last_version_by_subset_name,
 )
 from ayon_core.pipeline import publish
-from ayon_core.lib import EnumDef
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import EnumDef, is_in_tests
 from ayon_core.pipeline.version_start import get_versioning_start
 
 from ayon_core.pipeline.farm.pyblish_functions import (

client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.py

@@ -15,6 +15,7 @@ import re
 import os
 import platform
 
+__version__ = "1.0.0"
 
 ######################################################################
 # This is the function that Deadline calls to get an instance of the
@@ -52,6 +53,9 @@ class AyonDeadlinePlugin(DeadlinePlugin):
         del self.RenderArgumentCallback
 
     def InitializeProcess(self):
+        self.LogInfo(
+            "Initializing process with AYON plugin {}".format(__version__)
+        )
         self.PluginType = PluginType.Simple
         self.StdoutHandling = True
 

client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py

@@ -14,7 +14,7 @@ from Deadline.Scripting import (
     DirectoryUtils,
     ProcessUtils,
 )
-
+__version__ = "1.0.0"
 VERSION_REGEX = re.compile(
     r"(?P<major>0|[1-9]\d*)"
     r"\.(?P<minor>0|[1-9]\d*)"
@@ -593,7 +593,7 @@ def inject_render_job_id(deadlinePlugin):
 
 
 def __main__(deadlinePlugin):
-    print("*** GlobalJobPreload start ...")
+    print("*** GlobalJobPreload {} start ...".format(__version__))
     print(">>> Getting job ...")
     job = deadlinePlugin.GetJob()
 

client/ayon_core/modules/royalrender/lib.py

@@ -10,7 +10,12 @@ from datetime import datetime
 
 import pyblish.api
 
-from ayon_core.lib import BoolDef, NumberDef, is_running_from_build
+from ayon_core.lib import (
+    BoolDef,
+    NumberDef,
+    is_running_from_build,
+    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 (
@@ -22,7 +27,6 @@ from ayon_core.modules.royalrender.rr_job import (
 from ayon_core.pipeline import AYONPyblishPluginMixin
 from ayon_core.pipeline.publish import KnownPublishError
 from ayon_core.pipeline.publish.lib import get_published_workfile_instance
-from ayon_core.tests.lib import is_in_tests
 
 
 class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,

client/ayon_core/pipeline/context_tools.py

@@ -19,10 +19,10 @@ from ayon_core.client import (
     get_asset_name_identifier,
     get_ayon_server_api_connection,
 )
+from ayon_core.lib import is_in_tests
 from ayon_core.lib.events import emit_event
 from ayon_core.addon import load_addons, AddonsManager
 from ayon_core.settings import get_project_settings
-from ayon_core.tests.lib import is_in_tests
 
 from .publish.lib import filter_pyblish_plugins
 from .anatomy import Anatomy

client/ayon_core/plugins/publish/cleanup.py

@@ -5,7 +5,7 @@ import shutil
 import pyblish.api
 import re
 
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import is_in_tests
 
 
 class CleanUp(pyblish.api.InstancePlugin):

client/ayon_core/plugins/publish/collect_from_create_context.py

@@ -61,7 +61,10 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
             ("AVALON_ASSET", asset_name),
             ("AVALON_TASK", task_name)
         ):
-            os.environ[key] = value
+            if value is None:
+                os.environ.pop(key, None)
+            else:
+                os.environ[key] = value
 
     def create_instance(
         self,

client/ayon_core/plugins/publish/collect_scene_version.py

@@ -1,8 +1,7 @@
 import os
 import pyblish.api
 
-from ayon_core.lib import get_version_from_path
-from ayon_core.tests.lib import is_in_tests
+from ayon_core.lib import get_version_from_path, is_in_tests
 from ayon_core.pipeline import KnownPublishError
 
 

client/ayon_core/settings/defaults/system_settings/applications.json

@@ -1271,7 +1271,7 @@
         "icon": "{}/app_icons/harmony.png",
         "host_name": "harmony",
         "environment": {
-            "AVALON_HARMONY_WORKFILES_ON_LAUNCH": "1"
+            "AYON_HARMONY_WORKFILES_ON_LAUNCH": "1"
         },
         "variants": {
             "21": {