Merge remote-tracking branch 'upstream/develop' into maya_new_publisher

.github/workflows/project_actions.yml

@@ -25,7 +25,11 @@ jobs:
     if: |
       (github.event_name == 'issue_comment' && github.event.pull_request.head.repo.owner.login == 'ynput' && github.event.comment.user.id != 82967070) ||
       (github.event_name == 'pull_request_review_comment' && github.event.pull_request.head.repo.owner.login == 'ynput' && github.event.comment.user.type != 'Bot') ||
-      (github.event_name == 'pull_request_review' && github.event.pull_request.head.repo.owner.login == 'ynput' && github.event.review.state != 'changes_requested' && github.event.review.user.type != 'Bot')
+      (github.event_name == 'pull_request_review' &&
+      github.event.pull_request.head.repo.owner.login == 'ynput' &&
+      github.event.review.state != 'changes_requested' &&
+      github.event.review.state != 'approved' &&
+      github.event.review.user.type != 'Bot')
     steps:
       - name: Move PR to 'Review In Progress'
         uses: leonsteinhaeuser/project-beta-automations@v2.1.0
@@ -70,10 +74,7 @@ jobs:
   size-label:
     name: pr_size_label
     runs-on: ubuntu-latest
-    if: |
+    if: github.event.action == 'assigned' || github.event.action == 'opened'
-      (github.event_name == 'pull_request' && github.event.action == 'assigned') ||
-      (github.event_name == 'pull_request' && github.event.action == 'opened')
-
     steps:
       - name: Add size label
         uses: "pascalgn/size-label-action@v0.4.3"
@@ -94,9 +95,7 @@ jobs:
   label_prs_branch:
     name: pr_branch_label
     runs-on: ubuntu-latest
-    if: |
+    if: github.event.action == 'assigned' || github.event.action == 'opened'
-      (github.event_name == 'pull_request' && github.event.action == 'assigned') ||
-      (github.event_name == 'pull_request' && github.event.action == 'opened')
     steps:
     - name: Label PRs - Branch name detection
       uses: ffittschen/pr-branch-labeler@v1
@@ -106,9 +105,7 @@ jobs:
   label_prs_globe:
     name: pr_globe_label
     runs-on: ubuntu-latest
-    if: |
+    if: github.event.action == 'assigned' || github.event.action == 'opened'
-      (github.event_name == 'pull_request' && github.event.action == 'assigned') ||
-      (github.event_name == 'pull_request' && github.event.action == 'opened')
     steps:
     - name: Label PRs - Globe detection
       uses: actions/labeler@v4.0.3

openpype/modules/deadline/plugins/publish/submit_publish_job.py

@@ -951,17 +951,28 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             # we cannot attach AOVs to other subsets as we consider every
             # AOV subset of its own.
 
-            config = instance.data["colorspaceConfig"]
             additional_data = {
                 "renderProducts": instance.data["renderProducts"],
                 "colorspaceConfig": instance.data["colorspaceConfig"],
                 "display": instance.data["colorspaceDisplay"],
-                "view": instance.data["colorspaceView"],
+                "view": instance.data["colorspaceView"]
-                "colorspaceTemplate": config.replace(
-                    str(context.data["anatomy"].roots["work"]), "{root[work]}"
-                )
             }
 
+            # Get templated path from absolute config path.
+            anatomy = instance.context.data["anatomy"]
+            colorspaceTemplate = instance.data["colorspaceConfig"]
+            success, rootless_staging_dir = (
+                anatomy.find_root_template_from_path(colorspaceTemplate)
+            )
+            if success:
+                colorspaceTemplate = rootless_staging_dir
+            else:
+                self.log.warning((
+                    "Could not find root path for remapping \"{}\"."
+                    " This may cause issues on farm."
+                ).format(colorspaceTemplate))
+            additional_data["colorspaceTemplate"] = colorspaceTemplate
+
             if len(data.get("attachTo")) > 0:
                 assert len(data.get("expectedFiles")[0].keys()) == 1, (
                     "attaching multiple AOVs or renderable cameras to "

openpype/pipeline/create/context.py

@@ -596,7 +596,14 @@ class AttributeValues(object):
             self[_key] = _value
 
     def pop(self, key, default=None):
-        return self._data.pop(key, default)
+        value = self._data.pop(key, default)
+        # Remove attribute definition if is 'UnknownDef'
+        # - gives option to get rid of unknown values
+        attr_def = self._attr_defs_by_key.get(key)
+        if isinstance(attr_def, UnknownDef):
+            self._attr_defs_by_key.pop(key)
+            self._attr_defs.remove(attr_def)
+        return value
 
     def reset_values(self):
         self._data = {}

openpype/plugins/publish/collect_otio_review.py

@@ -87,7 +87,9 @@ class CollectOtioReview(pyblish.api.InstancePlugin):
                 otio_review_clips.append(otio_gap)
 
         if otio_review_clips:
-            instance.data["label"] += " (review)"
+            # add review track to instance and change label to reflect it
+            label = instance.data.get("label", instance.data["subset"])
+            instance.data["label"] = label + " (review)"
             instance.data["families"] += ["review", "ftrack"]
             instance.data["otioReviewClips"] = otio_review_clips
             self.log.info(

openpype/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.15.4-nightly.2"
+__version__ = "3.15.4-nightly.3"