Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Automated] Merged develop into main

Browse source
This commit is contained in:
ynbot 2024-01-03 16:13:46 +01:00 • committed by GitHub
commit a99508fcdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View file

@ -35,6 +35,7 @@ body:
label: Version label: Version
description: What version are you running? Look to OpenPype Tray description: What version are you running? Look to OpenPype Tray
options: options:
- 3.18.2-nightly.6
- 3.18.2-nightly.5 - 3.18.2-nightly.5
- 3.18.2-nightly.4 - 3.18.2-nightly.4
- 3.18.2-nightly.3 - 3.18.2-nightly.3
@ -134,7 +135,6 @@ body:
- 3.15.6-nightly.1 - 3.15.6-nightly.1
- 3.15.5 - 3.15.5
- 3.15.5-nightly.2 - 3.15.5-nightly.2
- 3.15.5-nightly.1
validations: validations:
required: true required: true
- type: dropdown - type: dropdown

4
openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
View file

@ -231,7 +231,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
job_info.EnvironmentKeyValue["OPENPYPE_LOG_NO_COLORS"] = "1" job_info.EnvironmentKeyValue["OPENPYPE_LOG_NO_COLORS"] = "1"
# Adding file dependencies. # Adding file dependencies.
if self.asset_dependencies: if not bool(os.environ.get("IS_TEST")) and self.asset_dependencies:
dependencies = instance.context.data["fileDependencies"] dependencies = instance.context.data["fileDependencies"]
for dependency in dependencies: for dependency in dependencies:
job_info.AssetDependency += dependency job_info.AssetDependency += dependency
@ -570,7 +570,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
job_info = copy.deepcopy(self.job_info) job_info = copy.deepcopy(self.job_info)
if self.asset_dependencies: if not bool(os.environ.get("IS_TEST")) and self.asset_dependencies:
# Asset dependency to wait for at least the scene file to sync. # Asset dependency to wait for at least the scene file to sync.
job_info.AssetDependency += self.scene_path job_info.AssetDependency += self.scene_path

4
openpype/modules/deadline/plugins/publish/submit_publish_job.py
View file

@ -297,7 +297,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
job_index)] = assembly_id # noqa: E501 job_index)] = assembly_id # noqa: E501
job_index += 1 job_index += 1
elif instance.data.get("bakingSubmissionJobs"): elif instance.data.get("bakingSubmissionJobs"):
self.log.info("Adding baking submission jobs as dependencies...") self.log.info(
"Adding baking submission jobs as dependencies..."
)
job_index = 0 job_index = 0
for assembly_id in instance.data["bakingSubmissionJobs"]: for assembly_id in instance.data["bakingSubmissionJobs"]:
payload["JobInfo"]["JobDependency{}".format( payload["JobInfo"]["JobDependency{}".format(

2
openpype/tools/ayon_workfiles/models/workfiles.py
View file

@ -606,7 +606,7 @@ class PublishWorkfilesModel:
print("Failed to format workfile path: {}".format(exc)) print("Failed to format workfile path: {}".format(exc))
dirpath, filename = os.path.split(workfile_path) dirpath, filename = os.path.split(workfile_path)
created_at = arrow.get(repre_entity["createdAt"].to("local")) created_at = arrow.get(repre_entity["createdAt"]).to("local")
return FileItem( return FileItem(
dirpath, dirpath,
filename, filename,

4
tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma
View file

@ -185,7 +185,7 @@ createNode objectSet -n "modelMain";
addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string"; addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string"; addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string"; addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string"; -dt "string";
setAttr ".ihi" 0; setAttr ".ihi" 0;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9"; setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
@ -296,7 +296,7 @@ createNode objectSet -n "workfileMain";
addAttr -ci true -sn "task" -ln "task" -dt "string"; addAttr -ci true -sn "task" -ln "task" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string"; addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string"; addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string"; -dt "string";
setAttr ".ihi" 0; setAttr ".ihi" 0;
setAttr ".hio" yes; setAttr ".hio" yes;

4
tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v002.ma
View file

@ -185,7 +185,7 @@ createNode objectSet -n "modelMain";
addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string"; addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string"; addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string"; addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string"; -dt "string";
setAttr ".ihi" 0; setAttr ".ihi" 0;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9"; setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
@ -296,7 +296,7 @@ createNode objectSet -n "workfileMain";
addAttr -ci true -sn "task" -ln "task" -dt "string"; addAttr -ci true -sn "task" -ln "task" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string"; addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string"; addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string"; -dt "string";
setAttr ".ihi" 0; setAttr ".ihi" 0;
setAttr ".hio" yes; setAttr ".hio" yes;

4
tests/integration/hosts/maya/test_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
View file

@ -185,7 +185,7 @@ createNode objectSet -n "modelMain";
addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string"; addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string"; addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string"; addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string"; -dt "string";
setAttr ".ihi" 0; setAttr ".ihi" 0;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9"; setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
@ -296,7 +296,7 @@ createNode objectSet -n "workfileMain";
addAttr -ci true -sn "task" -ln "task" -dt "string"; addAttr -ci true -sn "task" -ln "task" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string"; addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string"; addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string"; -dt "string";
setAttr ".ihi" 0; setAttr ".ihi" 0;
setAttr ".hio" yes; setAttr ".hio" yes;