mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
Merge branch 'develop' into bugfix/set-only-available-end-variables
This commit is contained in:
commit
2d33fd7d19
20 changed files with 39 additions and 26 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue