Merge remote-tracking branch 'origin/bugfix/list_appending_fix' into …

…feature/#649-Slack-integration

.github/workflows/nightly_merge.yml

@@ -1,4 +1,4 @@
-name: Nightly Merge
+name: Dev -> Main
 
 on:
  schedule:
@@ -20,4 +20,10 @@ jobs:
  github_token: ${{ secrets.ADMIN_TOKEN }}
  source_ref: 'develop'
  target_branch: 'main'
- commit_message_template: '[Automated] Merged {source_ref} into {target_branch}'
+ commit_message_template: '[Automated] Merged {source_ref} into {target_branch}'
+
+ - name: Invoke pre-release workflow
+ uses: benc-uk/workflow-dispatch@v1
+ with:
+ workflow: Nightly Prerelease
+ token: ${{ secrets.ADMIN_TOKEN }}

.github/workflows/prerelease.yml

@@ -1,15 +1,12 @@
 name: Nightly Prerelease
 
 on:
- push:
- branches: [main]
  workflow_dispatch:
 
 
 jobs:
  create_nightly:
  runs-on: ubuntu-latest
- if: github.actor != 'pypebot'
 
  steps:
  - name: 🚛 Checkout Code

CHANGELOG.md

@@ -1,15 +1,17 @@
 # Changelog
 
-## [3.1.0-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.1.0-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.0.0...HEAD)
 
 #### 🚀 Enhancements
 
+- Nuke - Publish simplification [\#1653](https://github.com/pypeclub/OpenPype/pull/1653)
 - \#1333 - added tooltip hints to Pyblish buttons [\#1649](https://github.com/pypeclub/OpenPype/pull/1649)
 
 #### 🐛 Bug fixes
 
+- Mac launch arguments fix [\#1660](https://github.com/pypeclub/OpenPype/pull/1660)
 - Fix missing dbm python module [\#1652](https://github.com/pypeclub/OpenPype/pull/1652)
 - Transparent branches in view on Mac [\#1648](https://github.com/pypeclub/OpenPype/pull/1648)
 - Add asset on task item [\#1646](https://github.com/pypeclub/OpenPype/pull/1646)

README.md

@@ -2,7 +2,7 @@
 OpenPype
 ====
 
-[![documentation](https://github.com/pypeclub/pype/actions/workflows/documentation.yml/badge.svg)](https://github.com/pypeclub/pype/actions/workflows/documentation.yml) ![GitHub Requirements](https://img.shields.io/requires/github/pypeclub/pype?labelColor=303846) ![GitHub VFX Platform](https://img.shields.io/badge/vfx%20platform-2021-lightgrey?labelColor=303846)
+[![documentation](https://github.com/pypeclub/pype/actions/workflows/documentation.yml/badge.svg)](https://github.com/pypeclub/pype/actions/workflows/documentation.yml) ![GitHub VFX Platform](https://img.shields.io/badge/vfx%20platform-2021-lightgrey?labelColor=303846)
 
 
 

openpype/hooks/pre_mac_launch.py

@@ -31,4 +31,4 @@ def execute(self):
  if len(self.launch_context.launch_args) > 1:
  self.launch_context.launch_args.insert(1, "--args")
  # Prepend open arguments
- self.launch_context.launch_args.insert(0, ["open", "-a"])
+ self.launch_context.launch_args.insert(0, ["open", "-na"])

openpype/hosts/nuke/api/lib.py

@@ -298,18 +298,21 @@ def create_write_node(name, data, input=None, prenodes=None, review=True):
  review (bool): adding review knob
 
  Example:
- prenodes = [(
- "NameNode", # string
- "NodeClass", # string
- ( # OrderDict: knob and values pairs
- ("knobName", "knobValue"),
- ("knobName", "knobValue")
- ),
- ( # list outputs
- "firstPostNodeName",
- "secondPostNodeName"
- )
- )
+ prenodes = [
+ {
+ "nodeName": {
+ "class": "" # string
+ "knobs": [
+ ("knobName": value),
+ ...
+ ],
+ "dependent": [
+ following_node_01,
+ ...
+ ]
+ }
+ },
+ ...
  ]
 
  Return:
@@ -385,35 +388,42 @@ def create_write_node(name, data, input=None, prenodes=None, review=True):
  prev_node.hideControlPanel()
  # creating pre-write nodes `prenodes`
  if prenodes:
- for name, klass, properties, set_output_to in prenodes:
+ for node in prenodes:
+ # get attributes
+ name = node["name"]
+ klass = node["class"]
+ knobs = node["knobs"]
+ dependent = node["dependent"]
+
  # create node
  now_node = nuke.createNode(klass, "name {}".format(name))
  now_node.hideControlPanel()
 
  # add data to knob
- for k, v in properties:
+ for _knob in knobs:
+ knob, value = _knob
  try:
- now_node[k].value()
+ now_node[knob].value()
  except NameError:
  log.warning(
  "knob `{}` does not exist on node `{}`".format(
- k, now_node["name"].value()
+ knob, now_node["name"].value()
  ))
  continue
 
- if k and v:
- now_node[k].setValue(str(v))
+ if knob and value:
+ now_node[knob].setValue(value)
 
  # connect to previous node
- if set_output_to:
- if isinstance(set_output_to, (tuple or list)):
- for i, node_name in enumerate(set_output_to):
+ if dependent:
+ if isinstance(dependent, (tuple or list)):
+ for i, node_name in enumerate(dependent):
  input_node = nuke.createNode(
  "Input", "name {}".format(node_name))
  input_node.hideControlPanel()
  now_node.setInput(1, input_node)
 
- elif isinstance(set_output_to, str):
+ elif isinstance(dependent, str):
  input_node = nuke.createNode(
  "Input", "name {}".format(node_name))
  input_node.hideControlPanel()

openpype/hosts/nuke/plugins/create/create_write_render.py

@@ -99,10 +99,28 @@ def process(self):
  "fpath_template": ("{work}/renders/nuke/{subset}"
  "/{subset}.{frame}.{ext}")})
 
+ # add crop node to cut off all outside of format bounding box
+ _prenodes = [
+ {
+ "name": "Crop01",
+ "class": "Crop",
+ "knobs": [
+ ("box", [
+ 0.0,
+ 0.0,
+ selected_node.width(),
+ selected_node.height()
+ ])
+ ],
+ "dependent": None
+ }
+ ]
+
  write_node = lib.create_write_node(
  self.data["subset"],
  write_data,
- input=selected_node)
+ input=selected_node,
+ prenodes=_prenodes)
 
  # relinking to collected connections
  for i, input in enumerate(inputs):

openpype/modules/standalonepublish_action.py

@@ -37,7 +37,7 @@ def run_standalone_publisher(self):
  args = get_pype_execute_args("standalonepublisher")
  kwargs = {}
  if platform.system().lower() == "darwin":
- new_args = ["open", "-a", args.pop(0), "--args"]
+ new_args = ["open", "-na", args.pop(0), "--args"]
  new_args.extend(args)
  args = new_args
 

openpype/settings/defaults/project_settings/nuke.json

@@ -43,11 +43,6 @@
  "optional": true,
  "active": true
  },
- "ValidateNukeWriteBoundingBox": {
- "enabled": true,
- "optional": true,
- "active": true
- },
  "ExtractThumbnail": {
  "enabled": true,
  "nodes": {

openpype/settings/entities/dict_mutable_keys_entity.py

@@ -467,7 +467,7 @@ def value(self):
  if self.store_as_list:
  output = []
  for key, child_entity in self.children_by_key.items():
- output.append(key, child_entity.value)
+ output.append([key, child_entity.value])
  return output
 
  output = {}

openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json

@@ -64,10 +64,6 @@
  {
  "key": "ValidateScript",
  "label": "Validate script settings"
- },
- {
- "key": "ValidateNukeWriteBoundingBox",
- "label": "Validate and Write Bounding Box"
  }
  ]
  },

openpype/tools/settings/settings/list_item_widget.py

@@ -100,7 +100,6 @@ def __init__(self, entity, entity_widget):
  self.input_field = self.create_ui_for_entity(
  self.category_widget, self.entity, self
  )
- self.input_field.set_entity_value()
 
  spacer_widget = QtWidgets.QWidget(self)
  spacer_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
@@ -337,6 +336,12 @@ def add_row(self, child_entity, row=None):
  self.content_layout.insertWidget(row + 1, item_widget)
  self.input_fields.insert(row, item_widget)
 
+ # Change to entity value after item is added to `input_fields`
+ # - may cause recursion error as setting a value may cause input field
+ # change which will trigger this validation if entity is already
+ # added as widget here which won't because is not in input_fields
+ item_widget.input_field.set_entity_value()
+
  if previous_field:
  previous_field.order_changed()
 

openpype/version.py

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