Merge branch 'develop' into feature/OP-3098_flame-extract-preset-distribution

.github/workflows/prerelease.yml

@@ -80,7 +80,7 @@ jobs:
         git tag -a $tag_name -m "nightly build"
     
     - name: Push to protected main branch
-      uses: CasperWA/push-protected@v2
+      uses: CasperWA/push-protected@v2.10.0
       with:
         token: ${{ secrets.ADMIN_TOKEN }}
         branch: main

.github/workflows/release.yml

@@ -68,7 +68,7 @@ jobs:
 
     - name: 🔏 Push to protected main branch
       if: steps.version.outputs.release_tag != 'skip'
-      uses: CasperWA/push-protected@v2
+      uses: CasperWA/push-protected@v2.10.0
       with:
         token: ${{ secrets.ADMIN_TOKEN }}
         branch: main

CHANGELOG.md

@@ -1,23 +1,45 @@
 # Changelog
 
-## [3.9.4-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.9.4-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.9.3...HEAD)
 
 ### 📖 Documentation
 
+- Documentation: more info about Tasks [\#3062](https://github.com/pypeclub/OpenPype/pull/3062)
 - Documentation: Python requirements to 3.7.9 [\#3035](https://github.com/pypeclub/OpenPype/pull/3035)
 - Website Docs: Remove unused pages [\#2974](https://github.com/pypeclub/OpenPype/pull/2974)
 
+**🆕 New features**
+
+- General: Local overrides for environment variables [\#3045](https://github.com/pypeclub/OpenPype/pull/3045)
+- Flame: Flare integration preparation [\#2928](https://github.com/pypeclub/OpenPype/pull/2928)
+
 **🚀 Enhancements**
 
+- TVPaint: Added init file for worker to triggers missing sound file dialog [\#3053](https://github.com/pypeclub/OpenPype/pull/3053)
+- Ftrack: Custom attributes can be filled in slate values [\#3036](https://github.com/pypeclub/OpenPype/pull/3036)
 - Resolve environment variable in google drive credential path  [\#3008](https://github.com/pypeclub/OpenPype/pull/3008)
 
 **🐛 Bug fixes**
 
+- GitHub: Updated push-protected action in github workflow [\#3064](https://github.com/pypeclub/OpenPype/pull/3064)
+- Nuke: Typos in imports from Nuke implementation [\#3061](https://github.com/pypeclub/OpenPype/pull/3061)
+- Hotfix: fixing deadline job publishing [\#3059](https://github.com/pypeclub/OpenPype/pull/3059)
+- General: Extract Review handle invalid characters for ffmpeg [\#3050](https://github.com/pypeclub/OpenPype/pull/3050)
+- Slate Review: Support to keep format on slate concatenation [\#3049](https://github.com/pypeclub/OpenPype/pull/3049)
+- Webpublisher: fix processing of workfile [\#3048](https://github.com/pypeclub/OpenPype/pull/3048)
 - Ftrack: Integrate ftrack api fix [\#3044](https://github.com/pypeclub/OpenPype/pull/3044)
 - Webpublisher - removed wrong hardcoded family [\#3043](https://github.com/pypeclub/OpenPype/pull/3043)
+- LibraryLoader: Use current project for asset query in families filter [\#3042](https://github.com/pypeclub/OpenPype/pull/3042)
+- SiteSync: Providers ignore that site is disabled [\#3041](https://github.com/pypeclub/OpenPype/pull/3041)
 - Unreal: Creator import fixes [\#3040](https://github.com/pypeclub/OpenPype/pull/3040)
+- SiteSync: fix transitive alternate sites, fix dropdown in Local Settings [\#3018](https://github.com/pypeclub/OpenPype/pull/3018)
+
+**Merged pull requests:**
+
+- Deadline: reworked pools assignment [\#3051](https://github.com/pypeclub/OpenPype/pull/3051)
+- Houdini: Avoid ImportError on `hdefereval` when Houdini runs without UI [\#2987](https://github.com/pypeclub/OpenPype/pull/2987)
 
 ## [3.9.3](https://github.com/pypeclub/OpenPype/tree/3.9.3) (2022-04-07)
 
@@ -38,24 +60,23 @@
 - Ftrack: Add more options for note text of integrate ftrack note [\#3025](https://github.com/pypeclub/OpenPype/pull/3025)
 - Console Interpreter: Changed how console splitter size are reused on show [\#3016](https://github.com/pypeclub/OpenPype/pull/3016)
 - Deadline: Use more suitable name for sequence review logic [\#3015](https://github.com/pypeclub/OpenPype/pull/3015)
+- General: default workfile subset name for workfile [\#3011](https://github.com/pypeclub/OpenPype/pull/3011)
 - Nuke: add concurrency attr to deadline job [\#3005](https://github.com/pypeclub/OpenPype/pull/3005)
-- Deadline: priority configurable in Maya jobs [\#2995](https://github.com/pypeclub/OpenPype/pull/2995)
 - Workfiles tool: Save as published workfiles [\#2937](https://github.com/pypeclub/OpenPype/pull/2937)
 
 **🐛 Bug fixes**
 
 - Deadline: Fixed default value of use sequence for review [\#3033](https://github.com/pypeclub/OpenPype/pull/3033)
 - Settings UI: Version column can be extended so version are visible [\#3032](https://github.com/pypeclub/OpenPype/pull/3032)
+- General: Fix validate asset docs plug-in filename and class name [\#3029](https://github.com/pypeclub/OpenPype/pull/3029)
 - General: Fix import after movements [\#3028](https://github.com/pypeclub/OpenPype/pull/3028)
 - Harmony: Added creating subset name for workfile from template [\#3024](https://github.com/pypeclub/OpenPype/pull/3024)
 - AfterEffects: Added creating subset name for workfile from template [\#3023](https://github.com/pypeclub/OpenPype/pull/3023)
 - General: Add example addons to ignored [\#3022](https://github.com/pypeclub/OpenPype/pull/3022)
-- SiteSync: fix transitive alternate sites, fix dropdown in Local Settings [\#3018](https://github.com/pypeclub/OpenPype/pull/3018)
 - Maya: Remove missing import [\#3017](https://github.com/pypeclub/OpenPype/pull/3017)
 - Ftrack: multiple  reviewable componets [\#3012](https://github.com/pypeclub/OpenPype/pull/3012)
 - Tray publisher: Fixes after code movement [\#3010](https://github.com/pypeclub/OpenPype/pull/3010)
 - Nuke: fixing unicode type detection in effect loaders [\#3002](https://github.com/pypeclub/OpenPype/pull/3002)
-- Fix - remove doubled dot in workfile created from template [\#2998](https://github.com/pypeclub/OpenPype/pull/2998)
 - Nuke: removing redundant Ftrack asset when farm publishing [\#2996](https://github.com/pypeclub/OpenPype/pull/2996)
 
 **Merged pull requests:**
@@ -75,12 +96,12 @@
 **🆕 New features**
 
 - nuke: bypass baking [\#2992](https://github.com/pypeclub/OpenPype/pull/2992)
-- Multiverse: Initial Support [\#2908](https://github.com/pypeclub/OpenPype/pull/2908)
 
 **🚀 Enhancements**
 
 - Photoshop: create image without instance [\#3001](https://github.com/pypeclub/OpenPype/pull/3001)
 - TVPaint: Render scene family [\#3000](https://github.com/pypeclub/OpenPype/pull/3000)
+- Deadline: priority configurable in Maya jobs [\#2995](https://github.com/pypeclub/OpenPype/pull/2995)
 - Nuke: ReviewDataMov Read RAW attribute [\#2985](https://github.com/pypeclub/OpenPype/pull/2985)
 - General: `METADATA\_KEYS` constant as `frozenset` for optimal immutable lookup [\#2980](https://github.com/pypeclub/OpenPype/pull/2980)
 - General: Tools with host filters [\#2975](https://github.com/pypeclub/OpenPype/pull/2975)
@@ -89,12 +110,11 @@
 - NewPublisher: Prepared implementation of optional pyblish plugin [\#2943](https://github.com/pypeclub/OpenPype/pull/2943)
 - TVPaint: Extractor to convert PNG into EXR [\#2942](https://github.com/pypeclub/OpenPype/pull/2942)
 - Workfiles: Open published workfiles [\#2925](https://github.com/pypeclub/OpenPype/pull/2925)
-- General: Default modules loaded dynamically [\#2923](https://github.com/pypeclub/OpenPype/pull/2923)
-- Nuke: improving readability [\#2903](https://github.com/pypeclub/OpenPype/pull/2903)
 
 **🐛 Bug fixes**
 
 - Hosts: Remove path existence checks in 'add\_implementation\_envs' [\#3004](https://github.com/pypeclub/OpenPype/pull/3004)
+- Fix - remove doubled dot in workfile created from template [\#2998](https://github.com/pypeclub/OpenPype/pull/2998)
 - PS: fix renaming subset incorrectly in PS [\#2991](https://github.com/pypeclub/OpenPype/pull/2991)
 - Fix: Disable setuptools auto discovery [\#2990](https://github.com/pypeclub/OpenPype/pull/2990)
 - AEL: fix opening existing workfile if no scene opened [\#2989](https://github.com/pypeclub/OpenPype/pull/2989)
@@ -115,15 +135,12 @@
 - Settings UI: Collapsed of collapsible wrapper works as expected [\#2934](https://github.com/pypeclub/OpenPype/pull/2934)
 - Maya: Do not pass `set` to maya commands \(fixes support for older maya versions\) [\#2932](https://github.com/pypeclub/OpenPype/pull/2932)
 - General: Don't print log record on OSError [\#2926](https://github.com/pypeclub/OpenPype/pull/2926)
-- Flame: centos related debugging [\#2922](https://github.com/pypeclub/OpenPype/pull/2922)
 
 **🔀 Refactored code**
 
 - General: Move plugins register and discover [\#2935](https://github.com/pypeclub/OpenPype/pull/2935)
 - General: Move Attribute Definitions from pipeline [\#2931](https://github.com/pypeclub/OpenPype/pull/2931)
 - General: Removed silo references and terminal splash [\#2927](https://github.com/pypeclub/OpenPype/pull/2927)
-- General: Move pipeline constants to OpenPype [\#2918](https://github.com/pypeclub/OpenPype/pull/2918)
-- General: Move remaining plugins from avalon [\#2912](https://github.com/pypeclub/OpenPype/pull/2912)
 
 **Merged pull requests:**
 
@@ -136,16 +153,6 @@
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.9.1-nightly.3...3.9.1)
 
-**🚀 Enhancements**
-
-- Nuke: Add no-audio Tag [\#2911](https://github.com/pypeclub/OpenPype/pull/2911)
-- General: Change how OPENPYPE\_DEBUG value is handled [\#2907](https://github.com/pypeclub/OpenPype/pull/2907)
-
-**🐛 Bug fixes**
-
-- General: Fix use of Anatomy roots [\#2904](https://github.com/pypeclub/OpenPype/pull/2904)
-- Fixing gap detection in extract review [\#2902](https://github.com/pypeclub/OpenPype/pull/2902)
-
 ## [3.9.0](https://github.com/pypeclub/OpenPype/tree/3.9.0) (2022-03-14)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.9.0-nightly.9...3.9.0)

openpype/hosts/nuke/plugins/inventory/select_containers.py

@@ -1,5 +1,5 @@
 from openpype.pipeline import InventoryAction
-from openpype.hosts.nuke.api.commands import viewer_update_and_undo_stop
+from openpype.hosts.nuke.api.command import viewer_update_and_undo_stop
 
 
 class SelectContainers(InventoryAction):

openpype/hosts/nuke/plugins/load/load_backdrop.py

@@ -14,7 +14,7 @@ from openpype.hosts.nuke.api.lib import (
     get_avalon_knob_data,
     set_avalon_knob_data
 )
-from openpype.hosts.nuke.api.commands import viewer_update_and_undo_stop
+from openpype.hosts.nuke.api.command import viewer_update_and_undo_stop
 from openpype.hosts.nuke.api import containerise, update_container
 
 

openpype/lib/profiles_filtering.py

@@ -44,12 +44,6 @@ def _profile_exclusion(matching_profiles, logger):
     Returns:
         dict: Most matching profile.
     """
-
-    logger.info(
-        "Search for first most matching profile in match order:"
-        " Host name -> Task name -> Family."
-    )
-
     if not matching_profiles:
         return None
 
@@ -168,6 +162,15 @@ def filter_profiles(profiles_data, key_values, keys_order=None, logger=None):
                 _keys_order.append(key)
         keys_order = tuple(_keys_order)
 
+    log_parts = " | ".join([
+        "{}: \"{}\"".format(*item)
+        for item in key_values.items()
+    ])
+
+    logger.info(
+        "Looking for matching profile for: {}".format(log_parts)
+    )
+
     matching_profiles = None
     highest_profile_points = -1
     # Each profile get 1 point for each matching filter. Profile with most
@@ -205,11 +208,6 @@ def filter_profiles(profiles_data, key_values, keys_order=None, logger=None):
         if profile_points == highest_profile_points:
             matching_profiles.append((profile, profile_scores))
 
-    log_parts = " | ".join([
-        "{}: \"{}\"".format(*item)
-        for item in key_values.items()
-    ])
-
     if not matching_profiles:
         logger.info(
             "None of profiles match your setup. {}".format(log_parts)
@@ -221,4 +219,9 @@ def filter_profiles(profiles_data, key_values, keys_order=None, logger=None):
             "More than one profile match your setup. {}".format(log_parts)
         )
 
-    return _profile_exclusion(matching_profiles, logger)
+    profile = _profile_exclusion(matching_profiles, logger)
+    if profile:
+        logger.info(
+            "Profile selected: {}".format(profile)
+        )
+    return profile

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

@@ -524,6 +524,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
 
         """
         representations = []
+        host_name = os.environ.get("AVALON_APP", "")
         collections, remainders = clique.assemble(exp_files)
 
         # create representation for every collected sequento ce
@@ -541,7 +542,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                     preview = True
                 else:
                     render_file_name = list(collection)[0]
-                    host_name = os.environ.get("AVALON_APP", "")
                     # if filtered aov name is found in filename, toggle it for
                     # preview video rendering
                     preview = match_aov_pattern(
@@ -610,12 +610,16 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                 "files": os.path.basename(remainder),
                 "stagingDir": os.path.dirname(remainder),
             }
-            if "render" in instance.get("families"):
+
+            preview = match_aov_pattern(
+                host_name, self.aov_filter, remainder
+            )
+            if preview:
                 rep.update({
                     "fps": instance.get("fps"),
                     "tags": ["review"]
                 })
-            self._solve_families(instance, True)
+            self._solve_families(instance, preview)
 
             already_there = False
             for repre in instance.get("representations", []):

openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py

@@ -34,6 +34,7 @@ class CollectFtrackFamily(pyblish.api.InstancePlugin):
             self.log.warning("No profiles present for adding Ftrack family")
             return
 
+        add_ftrack_family = False
         task_name = instance.data.get("task",
                                       avalon.api.Session["AVALON_TASK"])
         host_name = avalon.api.Session["AVALON_APP"]
@@ -53,6 +54,8 @@ class CollectFtrackFamily(pyblish.api.InstancePlugin):
 
             additional_filters = profile.get("advanced_filtering")
             if additional_filters:
+                self.log.info("'{}' families used for additional filtering".
+                              format(families))
                 add_ftrack_family = self._get_add_ftrack_f_from_addit_filters(
                     additional_filters,
                     families,
@@ -69,6 +72,13 @@ class CollectFtrackFamily(pyblish.api.InstancePlugin):
                 else:
                     instance.data["families"] = ["ftrack"]
 
+        result_str = "Adding"
+        if not add_ftrack_family:
+            result_str = "Not adding"
+        self.log.info("{} 'ftrack' family for instance with '{}'".format(
+            result_str, family
+        ))
+
     def _get_add_ftrack_f_from_addit_filters(self,
                                              additional_filters,
                                              families,

openpype/version.py

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

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.9.4-nightly.1" # OpenPype
+version = "3.9.4-nightly.2" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

website/docs/admin_settings_project_anatomy.md

@@ -59,7 +59,7 @@ We have a few required anatomy templates for OpenPype to work properly, however
 | `asset` | Name of asset or shot |
 | `task[name]` | Name of task |
 | `task[type]` | Type of task |
-| `task[short]` | Shortname of task |
+| `task[short]` | Short name of task type (eg. 'Modeling' > 'mdl') |
 | `parent` | Name of hierarchical parent |
 | `version` | Version number |
 | `subset` | Subset name |
@@ -105,5 +105,8 @@ We have a few required anatomy templates for OpenPype to work properly, however
 
 ## Task Types
 
+Current state of default Task descriptors.
+
+![tasks](assets/settings/anatomy_tasks.png)
 
 ## Colour Management and Formats