mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 12:54:40 +01:00
fix new line chars
This commit is contained in:
parent
b5961dcb92
commit
b403fccf05
15 changed files with 10 additions and 15 deletions
|
|
@ -24,7 +24,6 @@ from ayon_core.lib.env_tools import (
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@click.group(invoke_without_command=True)
|
@click.group(invoke_without_command=True)
|
||||||
@click.pass_context
|
@click.pass_context
|
||||||
@click.option("--use-staging", is_flag=True,
|
@click.option("--use-staging", is_flag=True,
|
||||||
|
|
@ -173,7 +172,6 @@ def contextselection(
|
||||||
main(output_path, project, folder, strict)
|
main(output_path, project, folder, strict)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@main_cli.command(
|
@main_cli.command(
|
||||||
context_settings=dict(
|
context_settings=dict(
|
||||||
ignore_unknown_options=True,
|
ignore_unknown_options=True,
|
||||||
|
|
|
||||||
|
|
@ -22,12 +22,10 @@ import clique
|
||||||
if typing.TYPE_CHECKING:
|
if typing.TYPE_CHECKING:
|
||||||
from typing import Self, Tuple, Union, TypedDict, Pattern
|
from typing import Self, Tuple, Union, TypedDict, Pattern
|
||||||
|
|
||||||
|
|
||||||
class EnumItemDict(TypedDict):
|
class EnumItemDict(TypedDict):
|
||||||
label: str
|
label: str
|
||||||
value: Any
|
value: Any
|
||||||
|
|
||||||
|
|
||||||
EnumItemsInputType = Union[
|
EnumItemsInputType = Union[
|
||||||
Dict[Any, str],
|
Dict[Any, str],
|
||||||
List[Tuple[Any, str]],
|
List[Tuple[Any, str]],
|
||||||
|
|
@ -35,7 +33,6 @@ if typing.TYPE_CHECKING:
|
||||||
List[EnumItemDict]
|
List[EnumItemDict]
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
class FileDefItemDict(TypedDict):
|
class FileDefItemDict(TypedDict):
|
||||||
directory: str
|
directory: str
|
||||||
filenames: List[str]
|
filenames: List[str]
|
||||||
|
|
@ -289,6 +286,7 @@ AttrDefType = TypeVar("AttrDefType", bound=AbstractAttrDef)
|
||||||
# UI attribute definitions won't hold value
|
# UI attribute definitions won't hold value
|
||||||
# -----------------------------------------
|
# -----------------------------------------
|
||||||
|
|
||||||
|
|
||||||
class UIDef(AbstractAttrDef):
|
class UIDef(AbstractAttrDef):
|
||||||
is_value_def = False
|
is_value_def = False
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -177,10 +177,12 @@ def initialize_ayon_connection(force=False):
|
||||||
return _new_get_last_versions(
|
return _new_get_last_versions(
|
||||||
con, *args, **kwargs
|
con, *args, **kwargs
|
||||||
)
|
)
|
||||||
|
|
||||||
def _lv_by_pi_wrapper(*args, **kwargs):
|
def _lv_by_pi_wrapper(*args, **kwargs):
|
||||||
return _new_get_last_version_by_product_id(
|
return _new_get_last_version_by_product_id(
|
||||||
con, *args, **kwargs
|
con, *args, **kwargs
|
||||||
)
|
)
|
||||||
|
|
||||||
def _lv_by_pn_wrapper(*args, **kwargs):
|
def _lv_by_pn_wrapper(*args, **kwargs):
|
||||||
return _new_get_last_version_by_product_name(
|
return _new_get_last_version_by_product_name(
|
||||||
con, *args, **kwargs
|
con, *args, **kwargs
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ class Terminal:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from ayon_core.lib import env_value_to_bool
|
from ayon_core.lib import env_value_to_bool
|
||||||
|
|
||||||
log_no_colors = env_value_to_bool(
|
log_no_colors = env_value_to_bool(
|
||||||
"AYON_LOG_NO_COLORS", default=None
|
"AYON_LOG_NO_COLORS", default=None
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ from ayon_core.tools.utils import show_message_dialog
|
||||||
OTIO = None
|
OTIO = None
|
||||||
FRAME_SPLITTER = "__frame_splitter__"
|
FRAME_SPLITTER = "__frame_splitter__"
|
||||||
|
|
||||||
|
|
||||||
def _import_otio():
|
def _import_otio():
|
||||||
global OTIO
|
global OTIO
|
||||||
if OTIO is None:
|
if OTIO is None:
|
||||||
|
|
|
||||||
|
|
@ -394,7 +394,6 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
|
||||||
if aov:
|
if aov:
|
||||||
anatomy_data["aov"] = aov
|
anatomy_data["aov"] = aov
|
||||||
|
|
||||||
|
|
||||||
def _fill_folder_data(self, instance, project_entity, anatomy_data):
|
def _fill_folder_data(self, instance, project_entity, anatomy_data):
|
||||||
# QUESTION: should we make sure that all folder data are popped if
|
# QUESTION: should we make sure that all folder data are popped if
|
||||||
# folder data cannot be found?
|
# folder data cannot be found?
|
||||||
|
|
|
||||||
|
|
@ -43,4 +43,3 @@ class CollectCoreJobEnvVars(pyblish.api.ContextPlugin):
|
||||||
if value:
|
if value:
|
||||||
self.log.debug(f"Setting job env: {key}: {value}")
|
self.log.debug(f"Setting job env: {key}: {value}")
|
||||||
env[key] = value
|
env[key] = value
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -194,7 +194,6 @@ class CollectOtioSubsetResources(
|
||||||
repre = self._create_representation(
|
repre = self._create_representation(
|
||||||
frame_start, frame_end, file=filename)
|
frame_start, frame_end, file=filename)
|
||||||
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
_trim = False
|
_trim = False
|
||||||
dirname, filename = os.path.split(media_ref.target_url)
|
dirname, filename = os.path.split(media_ref.target_url)
|
||||||
|
|
@ -209,7 +208,6 @@ class CollectOtioSubsetResources(
|
||||||
repre = self._create_representation(
|
repre = self._create_representation(
|
||||||
frame_start, frame_end, file=filename, trim=_trim)
|
frame_start, frame_end, file=filename, trim=_trim)
|
||||||
|
|
||||||
|
|
||||||
instance.data["originalDirname"] = self.staging_dir
|
instance.data["originalDirname"] = self.staging_dir
|
||||||
|
|
||||||
# add representation to instance data
|
# add representation to instance data
|
||||||
|
|
@ -221,7 +219,6 @@ class CollectOtioSubsetResources(
|
||||||
|
|
||||||
instance.data["representations"].append(repre)
|
instance.data["representations"].append(repre)
|
||||||
|
|
||||||
|
|
||||||
self.log.debug(instance.data)
|
self.log.debug(instance.data)
|
||||||
|
|
||||||
def _create_representation(self, start, end, **kwargs):
|
def _create_representation(self, start, end, **kwargs):
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,6 @@ class ModifiedBurnins(ffmpeg_burnins.Burnins):
|
||||||
if frame_end is not None:
|
if frame_end is not None:
|
||||||
options["frame_end"] = frame_end
|
options["frame_end"] = frame_end
|
||||||
|
|
||||||
|
|
||||||
options["label"] = align
|
options["label"] = align
|
||||||
self._add_burnin(text, align, options, DRAWTEXT)
|
self._add_burnin(text, align, options, DRAWTEXT)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -353,7 +353,6 @@ class BaseObj:
|
||||||
self.items[item.id] = item
|
self.items[item.id] = item
|
||||||
item.fill_data_format()
|
item.fill_data_format()
|
||||||
|
|
||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
for item in self.items.values():
|
for item in self.items.values():
|
||||||
item.reset()
|
item.reset()
|
||||||
|
|
|
||||||
|
|
@ -248,4 +248,3 @@ class EnhancedTabBar(QtWidgets.QTabBar):
|
||||||
|
|
||||||
else:
|
else:
|
||||||
super().mouseReleaseEvent(event)
|
super().mouseReleaseEvent(event)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -738,4 +738,3 @@ def main(force=False):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
main()
|
main()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,7 @@ def test_image_sequence():
|
||||||
expected_data,
|
expected_data,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_media_retimed():
|
def test_media_retimed():
|
||||||
"""
|
"""
|
||||||
EXR image sequence.
|
EXR image sequence.
|
||||||
|
|
|
||||||
|
|
@ -215,6 +215,7 @@ def test_short_movie_tail_gap_handles():
|
||||||
|
|
||||||
assert calls == expected
|
assert calls == expected
|
||||||
|
|
||||||
|
|
||||||
def test_multiple_review_clips_no_gap():
|
def test_multiple_review_clips_no_gap():
|
||||||
"""
|
"""
|
||||||
Use multiple review clips (image sequence).
|
Use multiple review clips (image sequence).
|
||||||
|
|
@ -298,6 +299,7 @@ def test_multiple_review_clips_no_gap():
|
||||||
|
|
||||||
assert calls == expected
|
assert calls == expected
|
||||||
|
|
||||||
|
|
||||||
def test_multiple_review_clips_with_gap():
|
def test_multiple_review_clips_with_gap():
|
||||||
"""
|
"""
|
||||||
Use multiple review clips (image sequence) with gap.
|
Use multiple review clips (image sequence) with gap.
|
||||||
|
|
|
||||||
|
|
@ -257,7 +257,6 @@ def test_movie_timewarp():
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def test_img_sequence_no_handles():
|
def test_img_sequence_no_handles():
|
||||||
"""
|
"""
|
||||||
Img sequence clip (no embedded timecode)
|
Img sequence clip (no embedded timecode)
|
||||||
|
|
@ -334,6 +333,7 @@ def test_img_sequence_relative_source_range():
|
||||||
expected_data
|
expected_data
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_img_sequence_conform_to_23_976fps():
|
def test_img_sequence_conform_to_23_976fps():
|
||||||
"""
|
"""
|
||||||
Img sequence clip
|
Img sequence clip
|
||||||
|
|
@ -409,6 +409,7 @@ def test_img_sequence_reverse_speed_no_tc():
|
||||||
handle_end=0,
|
handle_end=0,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_img_sequence_reverse_speed_from_24_to_23_976fps():
|
def test_img_sequence_reverse_speed_from_24_to_23_976fps():
|
||||||
"""
|
"""
|
||||||
Img sequence clip
|
Img sequence clip
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue