mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 12:54:40 +01:00
Merge branch 'develop' of https://github.com/ynput/ayon-core into bugfix/AY-7215_Explicit-frames-are-renamed-as-sequence
This commit is contained in:
commit
d665b9a575
5 changed files with 49 additions and 5 deletions
31
.github/workflows/pr_unittests.yaml
vendored
Normal file
31
.github/workflows/pr_unittests.yaml
vendored
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
name: 🧐 Run Unit Tests
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ develop ]
|
||||
pull_request:
|
||||
branches: [ develop ]
|
||||
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number}}
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.9'
|
||||
- name: Install requirements
|
||||
run: ./tools/manage.sh create-env
|
||||
- name: Run tests
|
||||
run: ./tools/manage.sh run-tests
|
||||
|
|
@ -53,7 +53,7 @@ IMAGE_EXTENSIONS = {
|
|||
".kra", ".logluv", ".mng", ".miff", ".nrrd", ".ora",
|
||||
".pam", ".pbm", ".pgm", ".ppm", ".pnm", ".pcx", ".pgf",
|
||||
".pictor", ".png", ".psd", ".psb", ".psp", ".qtvr",
|
||||
".ras", ".rgbe", ".sgi", ".tga",
|
||||
".ras", ".rgbe", ".sgi", ".sxr", ".tga",
|
||||
".tif", ".tiff", ".tiff/ep", ".tiff/it", ".ufo", ".ufp",
|
||||
".wbmp", ".webp", ".xr", ".xt", ".xbm", ".xcf", ".xpm", ".xwd"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -343,8 +343,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
|
|||
# to be published locally
|
||||
continue
|
||||
|
||||
valid = "review" in tags or "thumb-nuke" in tags
|
||||
if not valid:
|
||||
if "review" not in tags:
|
||||
continue
|
||||
|
||||
if not repre.get("files"):
|
||||
|
|
|
|||
|
|
@ -479,6 +479,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin,
|
|||
profile = {}
|
||||
|
||||
# Define defaults
|
||||
default_enabled = profile.get("contribution_enabled", True)
|
||||
default_contribution_layer = profile.get(
|
||||
"contribution_layer", None)
|
||||
default_apply_as_variant = profile.get(
|
||||
|
|
@ -513,7 +514,7 @@ class CollectUSDLayerContributions(pyblish.api.InstancePlugin,
|
|||
"In both cases the USD data itself is free to have "
|
||||
"references and sublayers of its own."
|
||||
),
|
||||
default=True),
|
||||
default=default_enabled),
|
||||
TextDef("contribution_target_product",
|
||||
label="Target product",
|
||||
tooltip=(
|
||||
|
|
|
|||
|
|
@ -91,6 +91,15 @@ class CollectUSDLayerContributionsProfileModel(BaseSettingsModel):
|
|||
" creating from within that task type."
|
||||
),
|
||||
)
|
||||
contribution_enabled: bool = SettingsField(
|
||||
True,
|
||||
title="Contribution Enabled (default)",
|
||||
description=(
|
||||
"The default state for USD Contribution being marked enabled or"
|
||||
" disabled for this profile."
|
||||
),
|
||||
section="Instance attribute defaults",
|
||||
)
|
||||
contribution_layer: str = SettingsField(
|
||||
"",
|
||||
title="Contribution Department Layer",
|
||||
|
|
@ -99,7 +108,6 @@ class CollectUSDLayerContributionsProfileModel(BaseSettingsModel):
|
|||
" matching this profile. The layer name should be in the"
|
||||
" 'Department Layer Orders' list to get a sensible order."
|
||||
),
|
||||
section="Instance attribute defaults",
|
||||
)
|
||||
contribution_apply_as_variant: bool = SettingsField(
|
||||
True,
|
||||
|
|
@ -1082,6 +1090,7 @@ DEFAULT_PUBLISH_VALUES = {
|
|||
{
|
||||
"product_types": ["model"],
|
||||
"task_types": [],
|
||||
"contribution_enabled": True,
|
||||
"contribution_layer": "model",
|
||||
"contribution_apply_as_variant": True,
|
||||
"contribution_target_product": "usdAsset"
|
||||
|
|
@ -1089,6 +1098,7 @@ DEFAULT_PUBLISH_VALUES = {
|
|||
{
|
||||
"product_types": ["look"],
|
||||
"task_types": [],
|
||||
"contribution_enabled": True,
|
||||
"contribution_layer": "look",
|
||||
"contribution_apply_as_variant": True,
|
||||
"contribution_target_product": "usdAsset"
|
||||
|
|
@ -1096,6 +1106,7 @@ DEFAULT_PUBLISH_VALUES = {
|
|||
{
|
||||
"product_types": ["groom"],
|
||||
"task_types": [],
|
||||
"contribution_enabled": True,
|
||||
"contribution_layer": "groom",
|
||||
"contribution_apply_as_variant": True,
|
||||
"contribution_target_product": "usdAsset"
|
||||
|
|
@ -1103,6 +1114,7 @@ DEFAULT_PUBLISH_VALUES = {
|
|||
{
|
||||
"product_types": ["rig"],
|
||||
"task_types": [],
|
||||
"contribution_enabled": True,
|
||||
"contribution_layer": "rig",
|
||||
"contribution_apply_as_variant": True,
|
||||
"contribution_target_product": "usdAsset"
|
||||
|
|
@ -1110,6 +1122,7 @@ DEFAULT_PUBLISH_VALUES = {
|
|||
{
|
||||
"product_types": ["usd"],
|
||||
"task_types": [],
|
||||
"contribution_enabled": True,
|
||||
"contribution_layer": "assembly",
|
||||
"contribution_apply_as_variant": False,
|
||||
"contribution_target_product": "usdShot"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue