From 316ba2294fdf0a7f3fef17ea9c4665c8e1f2a573 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 20 Sep 2022 10:15:11 +0200
Subject: [PATCH 01/29] hide drop label if it's not allowed to add anything

---
 openpype/widgets/attribute_defs/files_widget.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index d29aa1b607..e4d0a481c8 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -138,11 +138,13 @@ class DropEmpty(QtWidgets.QWidget):
             allowed_items = [item + "s" for item in allowed_items]
 
         if not allowed_items:
+            self._drop_label_widget.setVisible(False)
             self._items_label_widget.setText(
                 "It is not allowed to add anything here!"
             )
             return
 
+        self._drop_label_widget.setVisible(True)
         items_label = "Multiple "
         if self._single_item:
             items_label = "Single "

From 1aad016cb8f64baf419f4e9363cd81b3b2b449ad Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 20 Sep 2022 10:16:06 +0200
Subject: [PATCH 02/29] hide remove button if there are not file items

---
 openpype/widgets/attribute_defs/files_widget.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index e4d0a481c8..af15cfa859 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -594,6 +594,13 @@ class FilesView(QtWidgets.QListView):
 
         self._remove_btn.setVisible(not multivalue)
 
+    def update_remove_btn_visibility(self):
+        model = self.model()
+        visible = False
+        if model:
+            visible = model.rowCount() > 0
+        self._remove_btn.setVisible(visible)
+
     def has_selected_item_ids(self):
         """Is any index selected."""
         for index in self.selectionModel().selectedIndexes():
@@ -657,6 +664,7 @@ class FilesView(QtWidgets.QListView):
     def showEvent(self, event):
         super(FilesView, self).showEvent(event)
         self._update_remove_btn()
+        self.update_remove_btn_visibility()
 
 
 class FilesWidget(QtWidgets.QFrame):
@@ -968,3 +976,4 @@ class FilesWidget(QtWidgets.QFrame):
         files_exists = self._files_proxy_model.rowCount() > 0
         self._files_view.setVisible(files_exists)
         self._empty_widget.setVisible(not files_exists)
+        self._files_view.update_remove_btn_visibility()

From aa56f615819bc55f05736400a46c52d19d446134 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 20 Sep 2022 10:16:46 +0200
Subject: [PATCH 03/29] update visibility on add and remove

---
 openpype/widgets/attribute_defs/files_widget.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index af15cfa859..99498f9fa9 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -784,6 +784,8 @@ class FilesWidget(QtWidgets.QFrame):
         if not self._in_set_value:
             self.value_changed.emit()
 
+        self._update_visibility()
+
     def _on_rows_removed(self, parent_index, start_row, end_row):
         available_item_ids = set()
         for row in range(self._files_proxy_model.rowCount()):
@@ -803,6 +805,7 @@ class FilesWidget(QtWidgets.QFrame):
 
         if not self._in_set_value:
             self.value_changed.emit()
+        self._update_visibility()
 
     def _on_split_request(self):
         if self._multivalue:
@@ -966,11 +969,9 @@ class FilesWidget(QtWidgets.QFrame):
 
     def _add_filepaths(self, filepaths):
         self._files_model.add_filepaths(filepaths)
-        self._update_visibility()
 
     def _remove_item_by_ids(self, item_ids):
         self._files_model.remove_item_by_ids(item_ids)
-        self._update_visibility()
 
     def _update_visibility(self):
         files_exists = self._files_proxy_model.rowCount() > 0

From b78796f21c5ea31edd318361d614279da7a30af1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 20 Sep 2022 10:17:40 +0200
Subject: [PATCH 04/29] stack drop widget and files view to handle both size
 hints

---
 .../widgets/attribute_defs/files_widget.py    | 42 ++++++-------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 99498f9fa9..cf931ccbdc 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -683,12 +683,13 @@ class FilesWidget(QtWidgets.QFrame):
         files_proxy_model.setSourceModel(files_model)
         files_view = FilesView(self)
         files_view.setModel(files_proxy_model)
-        files_view.setVisible(False)
 
-        layout = QtWidgets.QHBoxLayout(self)
+        layout = QtWidgets.QStackedLayout(self)
         layout.setContentsMargins(0, 0, 0, 0)
-        layout.addWidget(empty_widget, 1)
-        layout.addWidget(files_view, 1)
+        layout.setStackingMode(layout.StackAll)
+        layout.addWidget(empty_widget)
+        layout.addWidget(files_view)
+        layout.setCurrentWidget(empty_widget)
 
         files_proxy_model.rowsInserted.connect(self._on_rows_inserted)
         files_proxy_model.rowsRemoved.connect(self._on_rows_removed)
@@ -708,6 +709,8 @@ class FilesWidget(QtWidgets.QFrame):
 
         self._widgets_by_id = {}
 
+        self._layout = layout
+
     def _set_multivalue(self, multivalue):
         if self._multivalue == multivalue:
             return
@@ -849,29 +852,6 @@ class FilesWidget(QtWidgets.QFrame):
 
         menu.popup(pos)
 
-    def sizeHint(self):
-        # Get size hints of widget and visible widgets
-        result = super(FilesWidget, self).sizeHint()
-        if not self._files_view.isVisible():
-            not_visible_hint = self._files_view.sizeHint()
-        else:
-            not_visible_hint = self._empty_widget.sizeHint()
-
-        # Get margins of this widget
-        margins = self.layout().contentsMargins()
-
-        # Change size hint based on result of maximum size hint of widgets
-        result.setWidth(max(
-            result.width(),
-            not_visible_hint.width() + margins.left() + margins.right()
-        ))
-        result.setHeight(max(
-            result.height(),
-            not_visible_hint.height() + margins.top() + margins.bottom()
-        ))
-
-        return result
-
     def dragEnterEvent(self, event):
         if self._multivalue:
             return
@@ -903,7 +883,6 @@ class FilesWidget(QtWidgets.QFrame):
         mime_data = event.mimeData()
         if mime_data.hasUrls():
             event.accept()
-            # event.setDropAction(QtCore.Qt.CopyAction)
             filepaths = []
             for url in mime_data.urls():
                 filepath = url.toLocalFile()
@@ -975,6 +954,9 @@ class FilesWidget(QtWidgets.QFrame):
 
     def _update_visibility(self):
         files_exists = self._files_proxy_model.rowCount() > 0
-        self._files_view.setVisible(files_exists)
-        self._empty_widget.setVisible(not files_exists)
+        if files_exists:
+            current_widget = self._files_view
+        else:
+            current_widget = self._empty_widget
+        self._layout.setCurrentWidget(current_widget)
         self._files_view.update_remove_btn_visibility()

From 7f5b192ac4ff7fcdabeab7d9ba85a47898865e57 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 20 Sep 2022 10:18:09 +0200
Subject: [PATCH 05/29] handle storing of inserted and removed items

---
 .../widgets/attribute_defs/files_widget.py    | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index cf931ccbdc..7a02a1b26b 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -237,10 +237,28 @@ class FilesModel(QtGui.QStandardItemModel):
         self._filenames_by_dirpath = collections.defaultdict(set)
         self._items_by_dirpath = collections.defaultdict(list)
 
+        self.rowsAboutToBeRemoved.connect(self._on_about_to_be_removed)
+        self.rowsInserted.connect(self._on_insert)
+
     @property
     def id(self):
         return self._id
 
+    def _on_about_to_be_removed(self, parent_index, start, end):
+        # Make sure items are removed from cache
+        for row in range(start, end + 1):
+            index = self.index(row, 0, parent_index)
+            item_id = index.data(ITEM_ID_ROLE)
+            if item_id is not None:
+                self._items_by_id.pop(item_id, None)
+
+    def _on_insert(self, parent_index, start, end):
+        for row in range(start, end + 1):
+            index = self.index(start, end, parent_index)
+            item_id = index.data(ITEM_ID_ROLE)
+            if item_id not in self._items_by_id:
+                self._items_by_id[item_id] = self.item(row)
+
     def set_multivalue(self, multivalue):
         """Disable filtering."""
 
@@ -354,6 +372,10 @@ class FilesModel(QtGui.QStandardItemModel):
             src_item_id = index.data(ITEM_ID_ROLE)
             src_item = self._items_by_id.get(src_item_id)
 
+        src_row = None
+        if src_item:
+            src_row = src_item.row()
+
         # Take out items that should be moved
         items = []
         for item_id in item_ids:
@@ -367,10 +389,12 @@ class FilesModel(QtGui.QStandardItemModel):
             return False
 
         # Calculate row where items should be inserted
-        if src_item:
-            src_row = src_item.row()
-        else:
-            src_row = root.rowCount()
+        row_count = root.rowCount()
+        if src_row is None:
+            src_row = row_count
+
+        if src_row > row_count:
+            src_row = row_count
 
         root.insertRow(src_row, items)
         return True

From 0f0a5fa294548d761d11eedd2c562b99fc19b3f4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 20 Sep 2022 10:28:37 +0200
Subject: [PATCH 06/29] added some docstrings

---
 openpype/widgets/attribute_defs/files_widget.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 7a02a1b26b..259cb774b0 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -245,7 +245,13 @@ class FilesModel(QtGui.QStandardItemModel):
         return self._id
 
     def _on_about_to_be_removed(self, parent_index, start, end):
-        # Make sure items are removed from cache
+        """Make sure that removed items are removed from items mapping.
+
+        Connected with '_on_insert'. When user drag item and drop it to same
+        view the item is actually removed and creted again but it happens in
+        inner calls of Qt.
+        """
+
         for row in range(start, end + 1):
             index = self.index(row, 0, parent_index)
             item_id = index.data(ITEM_ID_ROLE)
@@ -253,6 +259,13 @@ class FilesModel(QtGui.QStandardItemModel):
                 self._items_by_id.pop(item_id, None)
 
     def _on_insert(self, parent_index, start, end):
+        """Make sure new added items are stored in items mapping.
+
+        Connected to '_on_about_to_be_removed'. Some items are not created
+        using '_create_item' but are recreated using Qt. So the item is not in
+        mapping and if it would it would not lead to same item pointer.
+        """
+
         for row in range(start, end + 1):
             index = self.index(start, end, parent_index)
             item_id = index.data(ITEM_ID_ROLE)

From 65f31c445c5088ef6e02be9d9304b46aadc10402 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 11:26:36 +0200
Subject: [PATCH 07/29] Cache `get_objected_colors` function

---
 openpype/style/__init__.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openpype/style/__init__.py b/openpype/style/__init__.py
index b2a1a4ce6c..ca6183b62e 100644
--- a/openpype/style/__init__.py
+++ b/openpype/style/__init__.py
@@ -19,6 +19,8 @@ class _Cache:
     disabled_entity_icon_color = None
     deprecated_entity_font_color = None
 
+    objected_colors = None
+
 
 def get_style_image_path(image_name):
     # All filenames are lowered
@@ -81,10 +83,15 @@ def get_objected_colors():
     Returns:
         dict: Parsed color objects by keys in data.
     """
+    if _Cache.objected_colors is not None:
+        return _Cache.objected_colors
+
     colors_data = get_colors_data()
     output = {}
     for key, value in colors_data.items():
         output[key] = _convert_color_values_to_objects(value)
+
+    _Cache.objected_colors = output
     return output
 
 

From 0fd0e307ae6fed41505e38d2cbd27bfe72a5cf32 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 12:15:02 +0200
Subject: [PATCH 08/29] Cache colors data

---
 openpype/style/__init__.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openpype/style/__init__.py b/openpype/style/__init__.py
index ca6183b62e..b34e3f97b0 100644
--- a/openpype/style/__init__.py
+++ b/openpype/style/__init__.py
@@ -19,6 +19,7 @@ class _Cache:
     disabled_entity_icon_color = None
     deprecated_entity_font_color = None
 
+    colors_data = None
     objected_colors = None
 
 
@@ -48,8 +49,13 @@ def _get_colors_raw_data():
 
 def get_colors_data():
     """Only color data from stylesheet data."""
+    if _Cache.colors_data is not None:
+        return _Cache.colors_data
+
     data = _get_colors_raw_data()
-    return data.get("color") or {}
+    color_data = data.get("color") or {}
+    _Cache.colors_data = color_data
+    return color_data
 
 
 def _convert_color_values_to_objects(value):

From 02765e95c1a89882ff86778ecc4c98449dcc84ec Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 14:20:17 +0200
Subject: [PATCH 09/29] Continue instead of return to allow other valid configs
 to still be set

---
 openpype/hosts/houdini/api/shelves.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index 248d99105c..e179a5fde7 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -51,7 +51,7 @@ def generate_shelves():
             log.warning(
                 "No name found in shelf set definition."
             )
-            return
+            continue
 
         shelf_set = get_or_create_shelf_set(shelf_set_name)
 
@@ -63,7 +63,7 @@ def generate_shelves():
                     shelf_set_name
                 )
             )
-            return
+            continue
 
         for shelf_definition in shelves_definition:
             shelf_name = shelf_definition.get('shelf_name')
@@ -71,7 +71,7 @@ def generate_shelves():
                 log.warning(
                     "No name found in shelf definition."
                 )
-                return
+                continue
 
             shelf = get_or_create_shelf(shelf_name)
 
@@ -81,7 +81,7 @@ def generate_shelves():
                         shelf_name
                     )
                 )
-                return
+                continue
 
             mandatory_attributes = {'name', 'script'}
             for tool_definition in shelf_definition.get('tools_list'):
@@ -98,7 +98,7 @@ the script path of the tool.")
                 tool = get_or_create_tool(tool_definition, shelf)
 
                 if not tool:
-                    return
+                    continue
 
                 # Add the tool to the shelf if not already in it
                 if tool not in shelf.tools():

From 98d7de5103a1dae8bf7977f6c50b368b138369ca Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 14:21:00 +0200
Subject: [PATCH 10/29] Do not create Shelf Set if no shelf definition

---
 openpype/hosts/houdini/api/shelves.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index e179a5fde7..b78e461c66 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -53,10 +53,7 @@ def generate_shelves():
             )
             continue
 
-        shelf_set = get_or_create_shelf_set(shelf_set_name)
-
         shelves_definition = shelf_set_config.get('shelf_definition')
-
         if not shelves_definition:
             log.debug(
                 "No shelf definition found for shelf set named '{}'".format(
@@ -65,6 +62,7 @@ def generate_shelves():
             )
             continue
 
+        shelf_set = get_or_create_shelf_set(shelf_set_name)
         for shelf_definition in shelves_definition:
             shelf_name = shelf_definition.get('shelf_name')
             if not shelf_name:

From 0c08dd17e43746a72c21b28f359b43c48a02cefd Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 14:22:36 +0200
Subject: [PATCH 11/29] Remove default empty "OpenPype Shelves" shelf set.

If empty, it'd just spew warnings and remain redundant
---
 .../settings/defaults/project_settings/houdini.json  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/houdini.json b/openpype/settings/defaults/project_settings/houdini.json
index cdf829db57..1517983569 100644
--- a/openpype/settings/defaults/project_settings/houdini.json
+++ b/openpype/settings/defaults/project_settings/houdini.json
@@ -1,15 +1,5 @@
 {
-    "shelves": [
-        {
-            "shelf_set_name": "OpenPype Shelves",
-            "shelf_set_source_path": {
-                "windows": "",
-                "darwin": "",
-                "linux": ""
-            },
-            "shelf_definition": []
-        }
-    ],
+    "shelves": [],
     "create": {
         "CreateArnoldAss": {
             "enabled": true,

From 855a1e4eb074c4d42603c3bb5a7720bfaea5b0b8 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 14:25:31 +0200
Subject: [PATCH 12/29] Use `next` to directly stop on finding first match

---
 openpype/hosts/houdini/api/shelves.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index b78e461c66..eacd0a267f 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -119,12 +119,10 @@ def get_or_create_shelf_set(shelf_set_label):
     """
     all_shelves_sets = hou.shelves.shelfSets().values()
 
-    shelf_sets = [
-        shelf for shelf in all_shelves_sets if shelf.label() == shelf_set_label
-    ]
-
-    if shelf_sets:
-        return shelf_sets[0]
+    shelf_set = next((shelf for shelf in all_shelves_sets if
+                      shelf.label() == shelf_set_label), None)
+    if shelf_set:
+        return shelf_set[0]
 
     shelf_set_name = shelf_set_label.replace(' ', '_').lower()
     new_shelf_set = hou.shelves.newShelfSet(

From 7bd1d6c6b0362d660babfd3c29d23aea61660e7d Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 14:27:43 +0200
Subject: [PATCH 13/29] Fix typo

---
 openpype/hosts/houdini/api/shelves.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index eacd0a267f..a1bcac3b30 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -122,7 +122,7 @@ def get_or_create_shelf_set(shelf_set_label):
     shelf_set = next((shelf for shelf in all_shelves_sets if
                       shelf.label() == shelf_set_label), None)
     if shelf_set:
-        return shelf_set[0]
+        return shelf_set
 
     shelf_set_name = shelf_set_label.replace(' ', '_').lower()
     new_shelf_set = hou.shelves.newShelfSet(

From 4f5769550455c3545490a007b51948876885a3d9 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 14:28:47 +0200
Subject: [PATCH 14/29] Use `next` to return on first match

---
 openpype/hosts/houdini/api/shelves.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index a1bcac3b30..254e2278c2 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -144,10 +144,9 @@ def get_or_create_shelf(shelf_label):
     """
     all_shelves = hou.shelves.shelves().values()
 
-    shelf = [s for s in all_shelves if s.label() == shelf_label]
-
+    shelf = next((s for s in all_shelves if s.label() == shelf_label), None)
     if shelf:
-        return shelf[0]
+        return shelf
 
     shelf_name = shelf_label.replace(' ', '_').lower()
     new_shelf = hou.shelves.newShelf(

From d6a0f641920dad649701234e434abc21a7e88495 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 14:29:43 +0200
Subject: [PATCH 15/29] Use `next` to return on first match

---
 openpype/hosts/houdini/api/shelves.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index 254e2278c2..5ece24fb56 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -170,15 +170,15 @@ def get_or_create_tool(tool_definition, shelf):
     existing_tools = shelf.tools()
     tool_label = tool_definition.get('label')
 
-    existing_tool = [
-        tool for tool in existing_tools if tool.label() == tool_label
-    ]
-
+    existing_tool = next(
+        (tool for tool in existing_tools if tool.label() == tool_label),
+        None
+    )
     if existing_tool:
         tool_definition.pop('name', None)
         tool_definition.pop('label', None)
-        existing_tool[0].setData(**tool_definition)
-        return existing_tool[0]
+        existing_tool.setData(**tool_definition)
+        return existing_tool
 
     tool_name = tool_label.replace(' ', '_').lower()
 

From 4e8ae52a275af9b61f7ebcf7becf500e5cfa208f Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 15:16:00 +0200
Subject: [PATCH 16/29] Do no raise error but log error if filepath does not
 exist

---
 openpype/hosts/houdini/api/shelves.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index 5ece24fb56..b118b5e36d 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -34,14 +34,12 @@ def generate_shelves():
 
     for shelf_set_config in shelves_set_config:
         shelf_set_filepath = shelf_set_config.get('shelf_set_source_path')
-
-        if shelf_set_filepath[current_os]:
-            if not os.path.isfile(shelf_set_filepath[current_os]):
-                raise FileNotFoundError(
-                    "This path doesn't exist - {}".format(
-                        shelf_set_filepath[current_os]
-                    )
-                )
+        shelf_set_os_filepath = shelf_set_filepath[current_os]
+        if shelf_set_os_filepath:
+            if not os.path.isfile(shelf_set_os_filepath):
+                log.error("Shelf path doesn't exist - "
+                          "{}".format(shelf_set_os_filepath))
+                continue
 
             hou.shelves.newShelfSet(file_path=shelf_set_filepath[current_os])
             continue

From a93a09b47a0d091b9d51ac5e3113495d76970a88 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 15:17:37 +0200
Subject: [PATCH 17/29] Re-use variable

---
 openpype/hosts/houdini/api/shelves.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index b118b5e36d..1482af4301 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -41,7 +41,7 @@ def generate_shelves():
                           "{}".format(shelf_set_os_filepath))
                 continue
 
-            hou.shelves.newShelfSet(file_path=shelf_set_filepath[current_os])
+            hou.shelves.newShelfSet(file_path=shelf_set_os_filepath)
             continue
 
         shelf_set_name = shelf_set_config.get('shelf_set_name')

From a27a996878bb7939bbe39ce4eb837b9d4a10d0e4 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 15:19:35 +0200
Subject: [PATCH 18/29] Remove FileNotFound error definitions

---
 openpype/hosts/houdini/api/shelves.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index 1482af4301..b9f36bd1d3 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -1,7 +1,6 @@
 import os
 import logging
 import platform
-import six
 
 from openpype.settings import get_project_settings
 
@@ -9,16 +8,10 @@ import hou
 
 log = logging.getLogger("openpype.hosts.houdini.shelves")
 
-if six.PY2:
-    FileNotFoundError = IOError
-
 
 def generate_shelves():
     """This function generates complete shelves from shelf set to tools
     in Houdini from openpype project settings houdini shelf definition.
-
-    Raises:
-        FileNotFoundError: Raised when the shelf set filepath does not exist
     """
     current_os = platform.system().lower()
 

From 00785b89cfe18b7807d78a3de06825e29caf23a3 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 15:20:46 +0200
Subject: [PATCH 19/29] Tweak cosmetics

---
 openpype/hosts/houdini/api/shelves.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index b9f36bd1d3..f395bd8ef6 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -80,8 +80,8 @@ def generate_shelves():
                     tool_definition[key] for key in mandatory_attributes
                 ):
                     log.warning(
-                        "You need to specify at least the name and \
-the script path of the tool.")
+                        "You need to specify at least the name and the "
+                        "script path of the tool.")
                     continue
 
                 tool = get_or_create_tool(tool_definition, shelf)

From 64929258c87c41415220384465bacae7eec3c1dc Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 26 Sep 2022 15:22:27 +0200
Subject: [PATCH 20/29] Cosmetics

---
 openpype/hosts/houdini/api/shelves.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/houdini/api/shelves.py b/openpype/hosts/houdini/api/shelves.py
index f395bd8ef6..3ccab964cd 100644
--- a/openpype/hosts/houdini/api/shelves.py
+++ b/openpype/hosts/houdini/api/shelves.py
@@ -20,9 +20,7 @@ def generate_shelves():
     shelves_set_config = project_settings["houdini"]["shelves"]
 
     if not shelves_set_config:
-        log.debug(
-            "No custom shelves found in project settings."
-        )
+        log.debug("No custom shelves found in project settings.")
         return
 
     for shelf_set_config in shelves_set_config:
@@ -39,9 +37,7 @@ def generate_shelves():
 
         shelf_set_name = shelf_set_config.get('shelf_set_name')
         if not shelf_set_name:
-            log.warning(
-                "No name found in shelf set definition."
-            )
+            log.warning("No name found in shelf set definition.")
             continue
 
         shelves_definition = shelf_set_config.get('shelf_definition')
@@ -57,9 +53,7 @@ def generate_shelves():
         for shelf_definition in shelves_definition:
             shelf_name = shelf_definition.get('shelf_name')
             if not shelf_name:
-                log.warning(
-                    "No name found in shelf definition."
-                )
+                log.warning("No name found in shelf definition.")
                 continue
 
             shelf = get_or_create_shelf(shelf_name)
@@ -175,9 +169,7 @@ def get_or_create_tool(tool_definition, shelf):
 
     if not os.path.exists(tool_definition['script']):
         log.warning(
-            "This path doesn't exist - {}".format(
-                tool_definition['script']
-            )
+            "This path doesn't exist - {}".format(tool_definition['script'])
         )
         return
 

From 1423b8ba69869dbaa774e966f706b70eab7066dd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 28 Sep 2022 13:27:45 +0200
Subject: [PATCH 21/29] removed unused 'openpype.api' imports in maya
 validators

---
 .../hosts/maya/plugins/publish/validate_animation_content.py   | 1 -
 .../publish/validate_animation_out_set_related_node_ids.py     | 1 -
 .../hosts/maya/plugins/publish/validate_assembly_namespaces.py | 1 -
 .../hosts/maya/plugins/publish/validate_assembly_transforms.py | 1 -
 .../hosts/maya/plugins/publish/validate_camera_attributes.py   | 1 -
 .../hosts/maya/plugins/publish/validate_camera_contents.py     | 1 -
 openpype/hosts/maya/plugins/publish/validate_color_sets.py     | 1 -
 openpype/hosts/maya/plugins/publish/validate_cycle_error.py    | 1 -
 .../maya/plugins/publish/validate_instance_has_members.py      | 1 -
 openpype/hosts/maya/plugins/publish/validate_look_contents.py  | 1 -
 .../maya/plugins/publish/validate_look_id_reference_edits.py   | 1 -
 .../hosts/maya/plugins/publish/validate_look_members_unique.py | 1 -
 .../maya/plugins/publish/validate_look_no_default_shaders.py   | 1 -
 openpype/hosts/maya/plugins/publish/validate_look_sets.py      | 1 -
 .../hosts/maya/plugins/publish/validate_look_shading_group.py  | 1 -
 .../hosts/maya/plugins/publish/validate_look_single_shader.py  | 1 -
 .../maya/plugins/publish/validate_mesh_arnold_attributes.py    | 1 -
 openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py    | 1 -
 .../hosts/maya/plugins/publish/validate_mesh_lamina_faces.py   | 1 -
 openpype/hosts/maya/plugins/publish/validate_mesh_ngons.py     | 1 -
 .../maya/plugins/publish/validate_mesh_no_negative_scale.py    | 1 -
 .../hosts/maya/plugins/publish/validate_mesh_non_manifold.py   | 1 -
 .../hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py  | 1 -
 .../maya/plugins/publish/validate_mesh_normals_unlocked.py     | 1 -
 .../maya/plugins/publish/validate_mesh_overlapping_uvs.py      | 1 -
 .../maya/plugins/publish/validate_mesh_shader_connections.py   | 1 -
 .../hosts/maya/plugins/publish/validate_mesh_single_uv_set.py  | 1 -
 .../hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py    | 1 -
 .../maya/plugins/publish/validate_mesh_vertices_have_edges.py  | 1 -
 openpype/hosts/maya/plugins/publish/validate_model_content.py  | 1 -
 openpype/hosts/maya/plugins/publish/validate_model_name.py     | 1 -
 .../hosts/maya/plugins/publish/validate_mvlook_contents.py     | 1 -
 openpype/hosts/maya/plugins/publish/validate_no_animation.py   | 1 -
 .../hosts/maya/plugins/publish/validate_no_default_camera.py   | 1 -
 openpype/hosts/maya/plugins/publish/validate_no_namespace.py   | 1 -
 .../hosts/maya/plugins/publish/validate_no_null_transforms.py  | 1 -
 .../hosts/maya/plugins/publish/validate_no_unknown_nodes.py    | 1 -
 openpype/hosts/maya/plugins/publish/validate_node_ids.py       | 2 +-
 .../maya/plugins/publish/validate_node_ids_deformed_shapes.py  | 1 -
 .../maya/plugins/publish/validate_node_ids_in_database.py      | 1 -
 .../hosts/maya/plugins/publish/validate_node_ids_related.py    | 1 -
 .../hosts/maya/plugins/publish/validate_node_ids_unique.py     | 1 -
 .../hosts/maya/plugins/publish/validate_node_no_ghosting.py    | 2 +-
 .../maya/plugins/publish/validate_render_no_default_cameras.py | 2 +-
 .../maya/plugins/publish/validate_render_single_camera.py      | 1 -
 .../publish/validate_rig_controllers_arnold_attributes.py      | 1 -
 .../hosts/maya/plugins/publish/validate_rig_joints_hidden.py   | 2 +-
 .../maya/plugins/publish/validate_rig_out_set_node_ids.py      | 2 +-
 openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py | 1 -
 openpype/hosts/maya/plugins/publish/validate_shader_name.py    | 2 +-
 .../hosts/maya/plugins/publish/validate_shape_default_names.py | 2 +-
 .../hosts/maya/plugins/publish/validate_shape_render_stats.py  | 1 -
 openpype/hosts/maya/plugins/publish/validate_shape_zero.py     | 2 +-
 .../maya/plugins/publish/validate_skinCluster_deformer_set.py  | 2 +-
 openpype/hosts/maya/plugins/publish/validate_step_size.py      | 2 +-
 .../maya/plugins/publish/validate_transform_naming_suffix.py   | 2 +-
 openpype/hosts/maya/plugins/publish/validate_transform_zero.py | 2 +-
 .../maya/plugins/publish/validate_unreal_mesh_triangulated.py  | 3 ++-
 .../maya/plugins/publish/validate_unreal_staticmesh_naming.py  | 2 +-
 openpype/hosts/maya/plugins/publish/validate_visible_only.py   | 1 -
 .../hosts/maya/plugins/publish/validate_vrayproxy_members.py   | 1 -
 .../plugins/publish/validate_yeti_rig_input_in_instance.py     | 2 +-
 62 files changed, 16 insertions(+), 62 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/validate_animation_content.py b/openpype/hosts/maya/plugins/publish/validate_animation_content.py
index 6f7a6b905a..9dbb09a046 100644
--- a/openpype/hosts/maya/plugins/publish/validate_animation_content.py
+++ b/openpype/hosts/maya/plugins/publish/validate_animation_content.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py b/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
index aa27633402..649913fff6 100644
--- a/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
@@ -1,7 +1,6 @@
 import maya.cmds as cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import (
diff --git a/openpype/hosts/maya/plugins/publish/validate_assembly_namespaces.py b/openpype/hosts/maya/plugins/publish/validate_assembly_namespaces.py
index a9ea5a6d15..229da63c42 100644
--- a/openpype/hosts/maya/plugins/publish/validate_assembly_namespaces.py
+++ b/openpype/hosts/maya/plugins/publish/validate_assembly_namespaces.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
index fb25b617be..3f2c59b95b 100644
--- a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
+++ b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 
 from maya import cmds
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py b/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py
index 19c1179e52..bd1529e252 100644
--- a/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_camera_contents.py b/openpype/hosts/maya/plugins/publish/validate_camera_contents.py
index f846319807..1ce8026fc2 100644
--- a/openpype/hosts/maya/plugins/publish/validate_camera_contents.py
+++ b/openpype/hosts/maya/plugins/publish/validate_camera_contents.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_color_sets.py b/openpype/hosts/maya/plugins/publish/validate_color_sets.py
index cab9d6ebab..905417bafa 100644
--- a/openpype/hosts/maya/plugins/publish/validate_color_sets.py
+++ b/openpype/hosts/maya/plugins/publish/validate_color_sets.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_cycle_error.py b/openpype/hosts/maya/plugins/publish/validate_cycle_error.py
index d3b8316d94..210ee4127c 100644
--- a/openpype/hosts/maya/plugins/publish/validate_cycle_error.py
+++ b/openpype/hosts/maya/plugins/publish/validate_cycle_error.py
@@ -2,7 +2,6 @@ from maya import cmds
 
 import pyblish.api
 
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api.lib import maintained_selection
 from openpype.pipeline.publish import ValidateContentsOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_instance_has_members.py b/openpype/hosts/maya/plugins/publish/validate_instance_has_members.py
index bf92ac5099..4870f27bff 100644
--- a/openpype/hosts/maya/plugins/publish/validate_instance_has_members.py
+++ b/openpype/hosts/maya/plugins/publish/validate_instance_has_members.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_contents.py b/openpype/hosts/maya/plugins/publish/validate_look_contents.py
index d9819b05d5..53501d11e5 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_contents.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_contents.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py b/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
index f223c1a42b..a266a0fd74 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
@@ -2,7 +2,6 @@ from collections import defaultdict
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py b/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py
index 210fcb174d..f81e511ff3 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py
@@ -1,7 +1,6 @@
 from collections import defaultdict
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidatePipelineOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py b/openpype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
index 95f8fa20d0..db6aadae8d 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_sets.py b/openpype/hosts/maya/plugins/publish/validate_look_sets.py
index 3a60b771f4..8434ddde04 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_sets.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_sets.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import ValidateContentsOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py b/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py
index 7d043eddb8..9b57b06ee7 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py b/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py
index 51e1232bb7..788e440d12 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py b/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
index abfe1213a0..c1c0636b9e 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
@@ -1,7 +1,6 @@
 import pymel.core as pc
 from maya import cmds
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api.lib import maintained_selection
 from openpype.pipeline.publish import (
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py b/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py
index 4d2885d6e2..36a0da7a59 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py
@@ -3,7 +3,6 @@ import re
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateMeshOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py b/openpype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
index e7a73c21b0..4427c6eece 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateMeshOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_ngons.py b/openpype/hosts/maya/plugins/publish/validate_mesh_ngons.py
index 24d6188ec8..5b67db3307 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_ngons.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_ngons.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import ValidateContentsOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py b/openpype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
index 18ceccaa28..664e2b5772 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateMeshOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py b/openpype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
index e75a132d50..d7711da722 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateMeshOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py b/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
index 8c03b54971..0ef2716559 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import ValidateMeshOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py b/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
index 7d88161058..c8892a8e59 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
@@ -2,7 +2,6 @@ from maya import cmds
 import maya.api.OpenMaya as om2
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py b/openpype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
index dde3e4fead..be7324a68f 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 import math
 import maya.api.OpenMaya as om
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py b/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
index 9621fd5aa8..2a0abe975c 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py b/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
index 3fb09356d3..6ca8c06ba5 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import (
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py b/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
index 2711682f76..40ddb916ca 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
index 350a5f4789..1e6d290ae7 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
@@ -3,7 +3,6 @@ import re
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_model_content.py b/openpype/hosts/maya/plugins/publish/validate_model_content.py
index 0557858639..723346a285 100644
--- a/openpype/hosts/maya/plugins/publish/validate_model_content.py
+++ b/openpype/hosts/maya/plugins/publish/validate_model_content.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import ValidateContentsOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_model_name.py b/openpype/hosts/maya/plugins/publish/validate_model_name.py
index 99a4b2654e..2dec9ba267 100644
--- a/openpype/hosts/maya/plugins/publish/validate_model_name.py
+++ b/openpype/hosts/maya/plugins/publish/validate_model_name.py
@@ -5,7 +5,6 @@ import re
 from maya import cmds
 import pyblish.api
 
-import openpype.api
 from openpype.pipeline import legacy_io
 from openpype.pipeline.publish import ValidateContentsOrder
 import openpype.hosts.maya.api.action
diff --git a/openpype/hosts/maya/plugins/publish/validate_mvlook_contents.py b/openpype/hosts/maya/plugins/publish/validate_mvlook_contents.py
index 62f360cd86..67fc1616c2 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mvlook_contents.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mvlook_contents.py
@@ -1,6 +1,5 @@
 import os
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_no_animation.py b/openpype/hosts/maya/plugins/publish/validate_no_animation.py
index 177de1468d..2e7cafe4ab 100644
--- a/openpype/hosts/maya/plugins/publish/validate_no_animation.py
+++ b/openpype/hosts/maya/plugins/publish/validate_no_animation.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_no_default_camera.py b/openpype/hosts/maya/plugins/publish/validate_no_default_camera.py
index d4ddb28070..1a5773e6a7 100644
--- a/openpype/hosts/maya/plugins/publish/validate_no_default_camera.py
+++ b/openpype/hosts/maya/plugins/publish/validate_no_default_camera.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_no_namespace.py b/openpype/hosts/maya/plugins/publish/validate_no_namespace.py
index 95caa1007f..01c77e5b2e 100644
--- a/openpype/hosts/maya/plugins/publish/validate_no_namespace.py
+++ b/openpype/hosts/maya/plugins/publish/validate_no_namespace.py
@@ -2,7 +2,6 @@ import pymel.core as pm
 import maya.cmds as cmds
 
 import pyblish.api
-import openpype.api
 from openpype.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
diff --git a/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py b/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py
index f31fd09c95..b430c2b63c 100644
--- a/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py
+++ b/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py
@@ -1,7 +1,6 @@
 import maya.cmds as cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py b/openpype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
index 20fe34f2fd..2cfdc28128 100644
--- a/openpype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_node_ids.py b/openpype/hosts/maya/plugins/publish/validate_node_ids.py
index 877ba0e781..796f4c8d76 100644
--- a/openpype/hosts/maya/plugins/publish/validate_node_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_node_ids.py
@@ -1,5 +1,5 @@
 import pyblish.api
-import openpype.api
+
 from openpype.pipeline.publish import ValidatePipelineOrder
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
diff --git a/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py b/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
index 1fe4a34e07..68c47f3a96 100644
--- a/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import (
diff --git a/openpype/hosts/maya/plugins/publish/validate_node_ids_in_database.py b/openpype/hosts/maya/plugins/publish/validate_node_ids_in_database.py
index a5b1215f30..b2f28fd4e5 100644
--- a/openpype/hosts/maya/plugins/publish/validate_node_ids_in_database.py
+++ b/openpype/hosts/maya/plugins/publish/validate_node_ids_in_database.py
@@ -1,6 +1,5 @@
 import pyblish.api
 
-import openpype.api
 from openpype.client import get_assets
 from openpype.pipeline import legacy_io
 from openpype.pipeline.publish import ValidatePipelineOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_node_ids_related.py b/openpype/hosts/maya/plugins/publish/validate_node_ids_related.py
index a7595d7392..f901dc58c4 100644
--- a/openpype/hosts/maya/plugins/publish/validate_node_ids_related.py
+++ b/openpype/hosts/maya/plugins/publish/validate_node_ids_related.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 
 from openpype.pipeline.publish import ValidatePipelineOrder
 import openpype.hosts.maya.api.action
diff --git a/openpype/hosts/maya/plugins/publish/validate_node_ids_unique.py b/openpype/hosts/maya/plugins/publish/validate_node_ids_unique.py
index 5ff18358e2..f7a5e6e292 100644
--- a/openpype/hosts/maya/plugins/publish/validate_node_ids_unique.py
+++ b/openpype/hosts/maya/plugins/publish/validate_node_ids_unique.py
@@ -1,7 +1,6 @@
 from collections import defaultdict
 
 import pyblish.api
-import openpype.api
 from openpype.pipeline.publish import ValidatePipelineOrder
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
diff --git a/openpype/hosts/maya/plugins/publish/validate_node_no_ghosting.py b/openpype/hosts/maya/plugins/publish/validate_node_no_ghosting.py
index 2f22d6da1e..0f608dab2c 100644
--- a/openpype/hosts/maya/plugins/publish/validate_node_no_ghosting.py
+++ b/openpype/hosts/maya/plugins/publish/validate_node_no_ghosting.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py b/openpype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
index da35f42291..67ece75af8 100644
--- a/openpype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
+++ b/openpype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py b/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py
index fc41b1cf5b..f7ce8873f9 100644
--- a/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py
+++ b/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py
@@ -3,7 +3,6 @@ import re
 import pyblish.api
 from maya import cmds
 
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api.render_settings import RenderSettings
 from openpype.pipeline.publish import ValidateContentsOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py b/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
index 3d486cf7a4..55b2ebd6d8 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
@@ -1,7 +1,6 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
 
 from openpype.pipeline.publish import (
     ValidateContentsOrder,
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py b/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
index 86967d7502..d5bf7fd1cf 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import (
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py b/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
index 70128ac493..03ba381f8d 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
@@ -1,7 +1,7 @@
 import maya.cmds as cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import (
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py b/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py
index f075f42ff2..f3ed1a36ef 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py
@@ -2,7 +2,6 @@ import pymel.core as pc
 
 import pyblish.api
 
-import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     RepairAction,
diff --git a/openpype/hosts/maya/plugins/publish/validate_shader_name.py b/openpype/hosts/maya/plugins/publish/validate_shader_name.py
index 522b42fd00..b3e51f011d 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shader_name.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shader_name.py
@@ -2,7 +2,7 @@ import re
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py b/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py
index 25bd3442a3..651c6bcec9 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py
@@ -3,7 +3,7 @@ import re
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import (
     ValidateContentsOrder,
diff --git a/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py b/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py
index 0980d6b4b6..f58c0aaf81 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 
 from maya import cmds
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_shape_zero.py b/openpype/hosts/maya/plugins/publish/validate_shape_zero.py
index 9e30735d40..7a7e9a0aee 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shape_zero.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shape_zero.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import (
diff --git a/openpype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py b/openpype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
index 86ff914cb0..b45d2b120a 100644
--- a/openpype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
+++ b/openpype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_step_size.py b/openpype/hosts/maya/plugins/publish/validate_step_size.py
index 552a936966..294458f63c 100644
--- a/openpype/hosts/maya/plugins/publish/validate_step_size.py
+++ b/openpype/hosts/maya/plugins/publish/validate_step_size.py
@@ -1,5 +1,5 @@
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py b/openpype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
index 64faf9ecb6..4615e2ec07 100644
--- a/openpype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
+++ b/openpype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
@@ -3,7 +3,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_transform_zero.py b/openpype/hosts/maya/plugins/publish/validate_transform_zero.py
index 9e232f6023..da569195e8 100644
--- a/openpype/hosts/maya/plugins/publish/validate_transform_zero.py
+++ b/openpype/hosts/maya/plugins/publish/validate_transform_zero.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py b/openpype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
index 1ed3e5531c..4211e76a73 100644
--- a/openpype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
+++ b/openpype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
@@ -2,8 +2,9 @@
 
 from maya import cmds
 import pyblish.api
-import openpype.api
+
 from openpype.pipeline.publish import ValidateMeshOrder
+import openpype.hosts.maya.api.action
 
 
 class ValidateUnrealMeshTriangulated(pyblish.api.InstancePlugin):
diff --git a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
index a4bb54f5af..1425190b82 100644
--- a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
+++ b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
@@ -3,7 +3,7 @@
 import re
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline import legacy_io
 from openpype.settings import get_project_settings
diff --git a/openpype/hosts/maya/plugins/publish/validate_visible_only.py b/openpype/hosts/maya/plugins/publish/validate_visible_only.py
index f326b91796..faf634f258 100644
--- a/openpype/hosts/maya/plugins/publish/validate_visible_only.py
+++ b/openpype/hosts/maya/plugins/publish/validate_visible_only.py
@@ -1,6 +1,5 @@
 import pyblish.api
 
-import openpype.api
 from openpype.hosts.maya.api.lib import iter_visible_nodes_in_range
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
diff --git a/openpype/hosts/maya/plugins/publish/validate_vrayproxy_members.py b/openpype/hosts/maya/plugins/publish/validate_vrayproxy_members.py
index b94e5cbbed..855a96e6b9 100644
--- a/openpype/hosts/maya/plugins/publish/validate_vrayproxy_members.py
+++ b/openpype/hosts/maya/plugins/publish/validate_vrayproxy_members.py
@@ -1,5 +1,4 @@
 import pyblish.api
-import openpype.api
 
 from maya import cmds
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py b/openpype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py
index 0fe89634f5..ebef44774d 100644
--- a/openpype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py
+++ b/openpype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py
@@ -1,7 +1,7 @@
 from maya import cmds
 
 import pyblish.api
-import openpype.api
+
 import openpype.hosts.maya.api.action
 from openpype.pipeline.publish import ValidateContentsOrder
 

From 15105b36d94a7a5d1615652bfc5ef66b67571083 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 28 Sep 2022 20:03:58 +0200
Subject: [PATCH 22/29] Always return deep copy of the cache

---
 openpype/style/__init__.py | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/openpype/style/__init__.py b/openpype/style/__init__.py
index b34e3f97b0..4411af5451 100644
--- a/openpype/style/__init__.py
+++ b/openpype/style/__init__.py
@@ -1,4 +1,5 @@
 import os
+import copy
 import json
 import collections
 import six
@@ -49,13 +50,11 @@ def _get_colors_raw_data():
 
 def get_colors_data():
     """Only color data from stylesheet data."""
-    if _Cache.colors_data is not None:
-        return _Cache.colors_data
-
-    data = _get_colors_raw_data()
-    color_data = data.get("color") or {}
-    _Cache.colors_data = color_data
-    return color_data
+    if _Cache.colors_data is None:
+        data = _get_colors_raw_data()
+        color_data = data.get("color") or {}
+        _Cache.colors_data = color_data
+    return copy.deepcopy(_Cache.colors_data)
 
 
 def _convert_color_values_to_objects(value):
@@ -89,16 +88,15 @@ def get_objected_colors():
     Returns:
         dict: Parsed color objects by keys in data.
     """
-    if _Cache.objected_colors is not None:
-        return _Cache.objected_colors
+    if _Cache.objected_colors is None:
+        colors_data = get_colors_data()
+        output = {}
+        for key, value in colors_data.items():
+            output[key] = _convert_color_values_to_objects(value)
 
-    colors_data = get_colors_data()
-    output = {}
-    for key, value in colors_data.items():
-        output[key] = _convert_color_values_to_objects(value)
+        _Cache.objected_colors = output
 
-    _Cache.objected_colors = output
-    return output
+    return copy.deepcopy(_Cache.objected_colors)
 
 
 def _load_stylesheet():

From 24d9e5017d2a63abbf7e81f4d6dca53a99c5fa10 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 28 Sep 2022 20:27:01 +0200
Subject: [PATCH 23/29] Optimize use of cache by allowing to copy only the part
 of the data you need

---
 openpype/style/__init__.py                    | 23 ++++++++++++++++---
 .../publisher/widgets/border_label_widget.py  |  3 +--
 .../publisher/widgets/list_view_widgets.py    |  3 +--
 openpype/tools/settings/settings/widgets.py   |  5 ++--
 openpype/tools/tray/pype_tray.py              |  3 +--
 openpype/tools/utils/assets_widget.py         |  2 +-
 openpype/tools/utils/lib.py                   |  4 +---
 openpype/tools/utils/overlay_messages.py      |  3 +--
 openpype/tools/utils/widgets.py               |  2 +-
 openpype/widgets/nice_checkbox.py             |  3 +--
 10 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/openpype/style/__init__.py b/openpype/style/__init__.py
index 4411af5451..473fb42bb5 100644
--- a/openpype/style/__init__.py
+++ b/openpype/style/__init__.py
@@ -82,11 +82,25 @@ def _convert_color_values_to_objects(value):
     return parse_color(value)
 
 
-def get_objected_colors():
+def get_objected_colors(*keys):
     """Colors parsed from stylesheet data into color definitions.
 
+    You can pass multiple arguments to get a key from the data dict's colors.
+    Because this functions returns a deep copy of the cached data this allows
+    a much smaller dataset to be copied and thus result in a faster function.
+    It is however a micro-optimization in the area of 0.001s and smaller.
+
+    For example:
+        >>> get_colors_data()           # copy of full colors dict
+        >>> get_colors_data("font")
+        >>> get_colors_data("loader", "asset-view")
+
+    Args:
+        *keys: Each key argument will return a key nested deeper in the
+            objected colors data.
+
     Returns:
-        dict: Parsed color objects by keys in data.
+        Any: Parsed color objects by keys in data.
     """
     if _Cache.objected_colors is None:
         colors_data = get_colors_data()
@@ -96,7 +110,10 @@ def get_objected_colors():
 
         _Cache.objected_colors = output
 
-    return copy.deepcopy(_Cache.objected_colors)
+    output = _Cache.objected_colors
+    for key in keys:
+        output = output[key]
+    return copy.deepcopy(output)
 
 
 def _load_stylesheet():
diff --git a/openpype/tools/publisher/widgets/border_label_widget.py b/openpype/tools/publisher/widgets/border_label_widget.py
index 696a9050b8..8e09dd817e 100644
--- a/openpype/tools/publisher/widgets/border_label_widget.py
+++ b/openpype/tools/publisher/widgets/border_label_widget.py
@@ -158,8 +158,7 @@ class BorderedLabelWidget(QtWidgets.QFrame):
     """
     def __init__(self, label, parent):
         super(BorderedLabelWidget, self).__init__(parent)
-        colors_data = get_objected_colors()
-        color_value = colors_data.get("border")
+        color_value = get_objected_colors("border")
         color = None
         if color_value:
             color = color_value.get_qcolor()
diff --git a/openpype/tools/publisher/widgets/list_view_widgets.py b/openpype/tools/publisher/widgets/list_view_widgets.py
index 6e31ba635b..32b923c5d6 100644
--- a/openpype/tools/publisher/widgets/list_view_widgets.py
+++ b/openpype/tools/publisher/widgets/list_view_widgets.py
@@ -54,8 +54,7 @@ class ListItemDelegate(QtWidgets.QStyledItemDelegate):
     def __init__(self, parent):
         super(ListItemDelegate, self).__init__(parent)
 
-        colors_data = get_objected_colors()
-        group_color_info = colors_data["publisher"]["list-view-group"]
+        colors_data = get_objected_colors("publisher", "list-view-group")
 
         self._group_colors = {
             key: value.get_qcolor()
diff --git a/openpype/tools/settings/settings/widgets.py b/openpype/tools/settings/settings/widgets.py
index 1a4a6877b0..722717df89 100644
--- a/openpype/tools/settings/settings/widgets.py
+++ b/openpype/tools/settings/settings/widgets.py
@@ -323,7 +323,7 @@ class SettingsToolBtn(ImageButton):
     @classmethod
     def _get_icon_type(cls, btn_type):
         if btn_type not in cls._cached_icons:
-            settings_colors = get_objected_colors()["settings"]
+            settings_colors = get_objected_colors("settings")
             normal_color = settings_colors["image-btn"].get_qcolor()
             hover_color = settings_colors["image-btn-hover"].get_qcolor()
             disabled_color = settings_colors["image-btn-disabled"].get_qcolor()
@@ -789,8 +789,7 @@ class ProjectModel(QtGui.QStandardItemModel):
         self._items_by_name = {}
         self._versions_by_project = {}
 
-        colors = get_objected_colors()
-        font_color = colors["font"].get_qcolor()
+        font_color = get_objected_colors("font").get_qcolor()
         font_color.setAlpha(67)
         self._version_font_color = font_color
         self._current_version = get_openpype_version()
diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py
index 348573a191..8a24b3eaa6 100644
--- a/openpype/tools/tray/pype_tray.py
+++ b/openpype/tools/tray/pype_tray.py
@@ -144,8 +144,7 @@ class VersionUpdateDialog(QtWidgets.QDialog):
             "gifts.png"
         )
         src_image = QtGui.QImage(image_path)
-        colors = style.get_objected_colors()
-        color_value = colors["font"]
+        color_value = style.get_objected_colors("font")
 
         return paint_image_with_color(
             src_image,
diff --git a/openpype/tools/utils/assets_widget.py b/openpype/tools/utils/assets_widget.py
index 772946e9e1..2a1fb4567c 100644
--- a/openpype/tools/utils/assets_widget.py
+++ b/openpype/tools/utils/assets_widget.py
@@ -114,7 +114,7 @@ class UnderlinesAssetDelegate(QtWidgets.QItemDelegate):
 
     def __init__(self, *args, **kwargs):
         super(UnderlinesAssetDelegate, self).__init__(*args, **kwargs)
-        asset_view_colors = get_objected_colors()["loader"]["asset-view"]
+        asset_view_colors = get_objected_colors("loader", "asset-view")
         self._selected_color = (
             asset_view_colors["selected"].get_qcolor()
         )
diff --git a/openpype/tools/utils/lib.py b/openpype/tools/utils/lib.py
index 97b680b77e..fe7dda454b 100644
--- a/openpype/tools/utils/lib.py
+++ b/openpype/tools/utils/lib.py
@@ -822,8 +822,6 @@ def get_warning_pixmap(color=None):
     src_image_path = get_image_path("warning.png")
     src_image = QtGui.QImage(src_image_path)
     if color is None:
-        colors = get_objected_colors()
-        color_value = colors["delete-btn-bg"]
-        color = color_value.get_qcolor()
+        color = get_objected_colors("delete-btn-bg").get_qcolor()
 
     return paint_image_with_color(src_image, color)
diff --git a/openpype/tools/utils/overlay_messages.py b/openpype/tools/utils/overlay_messages.py
index 62de2cf272..cbcbb15621 100644
--- a/openpype/tools/utils/overlay_messages.py
+++ b/openpype/tools/utils/overlay_messages.py
@@ -14,8 +14,7 @@ class CloseButton(QtWidgets.QFrame):
 
     def __init__(self, parent):
         super(CloseButton, self).__init__(parent)
-        colors = get_objected_colors()
-        close_btn_color = colors["overlay-messages"]["close-btn"]
+        close_btn_color = get_objected_colors("overlay-messages", "close-btn")
         self._color = close_btn_color.get_qcolor()
         self._mouse_pressed = False
         policy = QtWidgets.QSizePolicy(
diff --git a/openpype/tools/utils/widgets.py b/openpype/tools/utils/widgets.py
index df0d349822..c8133b3359 100644
--- a/openpype/tools/utils/widgets.py
+++ b/openpype/tools/utils/widgets.py
@@ -40,7 +40,7 @@ class PlaceholderLineEdit(QtWidgets.QLineEdit):
         # Change placeholder palette color
         if hasattr(QtGui.QPalette, "PlaceholderText"):
             filter_palette = self.palette()
-            color_obj = get_objected_colors()["font"]
+            color_obj = get_objected_colors("font")
             color = color_obj.get_qcolor()
             color.setAlpha(67)
             filter_palette.setColor(
diff --git a/openpype/widgets/nice_checkbox.py b/openpype/widgets/nice_checkbox.py
index 56e6d2ac24..334a5d197b 100644
--- a/openpype/widgets/nice_checkbox.py
+++ b/openpype/widgets/nice_checkbox.py
@@ -66,8 +66,7 @@ class NiceCheckbox(QtWidgets.QFrame):
         if cls._checked_bg_color is not None:
             return
 
-        colors_data = get_objected_colors()
-        colors_info = colors_data["nice-checkbox"]
+        colors_info = get_objected_colors("nice-checkbox")
 
         cls._checked_bg_color = colors_info["bg-checked"].get_qcolor()
         cls._unchecked_bg_color = colors_info["bg-unchecked"].get_qcolor()

From e66dbfd3f25249941c462d443c8d1dfb54b2c445 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 28 Sep 2022 20:28:20 +0200
Subject: [PATCH 24/29] Fix refactor

---
 openpype/tools/publisher/widgets/list_view_widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/tools/publisher/widgets/list_view_widgets.py b/openpype/tools/publisher/widgets/list_view_widgets.py
index 32b923c5d6..a701181e5b 100644
--- a/openpype/tools/publisher/widgets/list_view_widgets.py
+++ b/openpype/tools/publisher/widgets/list_view_widgets.py
@@ -54,7 +54,7 @@ class ListItemDelegate(QtWidgets.QStyledItemDelegate):
     def __init__(self, parent):
         super(ListItemDelegate, self).__init__(parent)
 
-        colors_data = get_objected_colors("publisher", "list-view-group")
+        group_color_info = get_objected_colors("publisher", "list-view-group")
 
         self._group_colors = {
             key: value.get_qcolor()

From 387a43b09ef5ab3c5441d20d4d04f24f69051274 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 29 Sep 2022 10:29:19 +0200
Subject: [PATCH 25/29] fix import of render settings

---
 .../hosts/maya/plugins/publish/validate_render_single_camera.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py b/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py
index f7ce8873f9..77322fefd5 100644
--- a/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py
+++ b/openpype/hosts/maya/plugins/publish/validate_render_single_camera.py
@@ -4,7 +4,7 @@ import pyblish.api
 from maya import cmds
 
 import openpype.hosts.maya.api.action
-from openpype.hosts.maya.api.render_settings import RenderSettings
+from openpype.hosts.maya.api.lib_rendersettings import RenderSettings
 from openpype.pipeline.publish import ValidateContentsOrder
 
 

From 04f75953d23486bdde8ebb91b49e9864e89d7a6c Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Sat, 1 Oct 2022 04:28:26 +0000
Subject: [PATCH 26/29] [Automated] Bump version

---
 CHANGELOG.md        | 19 +++----------------
 openpype/version.py |  2 +-
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8af555adf2..c64a17874a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [3.14.3-nightly.5](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.14.3-nightly.6](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.14.2...HEAD)
 
@@ -17,12 +17,12 @@
 - Photoshop: synchronize image version with workfile [\#3854](https://github.com/pypeclub/OpenPype/pull/3854)
 - General: Transcoding handle float2 attr type [\#3849](https://github.com/pypeclub/OpenPype/pull/3849)
 - General: Simple script for getting license information about used packages [\#3843](https://github.com/pypeclub/OpenPype/pull/3843)
-- Houdini: Increment current file on workfile publish [\#3840](https://github.com/pypeclub/OpenPype/pull/3840)
 - General: Workfile template build enhancements [\#3838](https://github.com/pypeclub/OpenPype/pull/3838)
 - General: lock task workfiles when they are working on [\#3810](https://github.com/pypeclub/OpenPype/pull/3810)
 
 **🐛 Bug fixes**
 
+- Maya: Fix Render single camera validator [\#3929](https://github.com/pypeclub/OpenPype/pull/3929)
 - Flame: loading multilayer exr to batch/reel is working [\#3901](https://github.com/pypeclub/OpenPype/pull/3901)
 - Hiero: Fix inventory check on launch [\#3895](https://github.com/pypeclub/OpenPype/pull/3895)
 - WebPublisher: Fix import after refactor [\#3891](https://github.com/pypeclub/OpenPype/pull/3891)
@@ -33,10 +33,10 @@
 - Tray Publisher: skip plugin if otioTimeline is missing [\#3856](https://github.com/pypeclub/OpenPype/pull/3856)
 - Flame: retimed attributes are integrated with settings [\#3855](https://github.com/pypeclub/OpenPype/pull/3855)
 - Maya: Extract Playblast fix textures + labelize viewport show settings [\#3852](https://github.com/pypeclub/OpenPype/pull/3852)
-- Maya Deadline: Fix Tile Rendering by forcing integer pixel values [\#3758](https://github.com/pypeclub/OpenPype/pull/3758)
 
 **🔀 Refactored code**
 
+- Maya: Remove unused 'openpype.api' imports in plugins [\#3925](https://github.com/pypeclub/OpenPype/pull/3925)
 - Resolve: Use new Extractor location [\#3918](https://github.com/pypeclub/OpenPype/pull/3918)
 - Unreal: Use new Extractor location [\#3917](https://github.com/pypeclub/OpenPype/pull/3917)
 - Flame: Use new Extractor location [\#3916](https://github.com/pypeclub/OpenPype/pull/3916)
@@ -45,7 +45,6 @@
 - Hiero: Use new Extractor location [\#3851](https://github.com/pypeclub/OpenPype/pull/3851)
 - Maya: Remove old legacy \(ftrack\) plug-ins that are of no use anymore [\#3819](https://github.com/pypeclub/OpenPype/pull/3819)
 - Nuke: Use new Extractor location [\#3799](https://github.com/pypeclub/OpenPype/pull/3799)
-- Maya: Use new Extractor location [\#3775](https://github.com/pypeclub/OpenPype/pull/3775)
 
 **Merged pull requests:**
 
@@ -104,18 +103,6 @@
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.14.1-nightly.4...3.14.1)
 
-**🚀 Enhancements**
-
-- General: Thumbnail can use project roots [\#3750](https://github.com/pypeclub/OpenPype/pull/3750)
-
-**🐛 Bug fixes**
-
-- Maya: Fix typo in getPanel argument `with\_focus` -\> `withFocus` [\#3753](https://github.com/pypeclub/OpenPype/pull/3753)
-
-**🔀 Refactored code**
-
-- General: Move delivery logic to pipeline [\#3751](https://github.com/pypeclub/OpenPype/pull/3751)
-
 ## [3.14.0](https://github.com/pypeclub/OpenPype/tree/3.14.0) (2022-08-18)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.14.0-nightly.1...3.14.0)
diff --git a/openpype/version.py b/openpype/version.py
index 18ff49ffbf..7cd3481441 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.14.3-nightly.5"
+__version__ = "3.14.3-nightly.6"

From bf69a9b4726f8f10277fe9384ad6c398d4f4717f Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Mon, 3 Oct 2022 10:16:11 +0000
Subject: [PATCH 27/29] [Automated] Bump version

---
 CHANGELOG.md        | 4 ++--
 openpype/version.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c64a17874a..35f29596a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [3.14.3-nightly.6](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.14.3-nightly.7](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.14.2...HEAD)
 
@@ -33,6 +33,7 @@
 - Tray Publisher: skip plugin if otioTimeline is missing [\#3856](https://github.com/pypeclub/OpenPype/pull/3856)
 - Flame: retimed attributes are integrated with settings [\#3855](https://github.com/pypeclub/OpenPype/pull/3855)
 - Maya: Extract Playblast fix textures + labelize viewport show settings [\#3852](https://github.com/pypeclub/OpenPype/pull/3852)
+- Resolve: Addon import is Python 2 compatible [\#3798](https://github.com/pypeclub/OpenPype/pull/3798)
 
 **🔀 Refactored code**
 
@@ -74,7 +75,6 @@
 - Launcher: Skip opening last work file works for groups [\#3822](https://github.com/pypeclub/OpenPype/pull/3822)
 - Maya: Publishing data key change [\#3811](https://github.com/pypeclub/OpenPype/pull/3811)
 - Igniter: Fix status handling when version is already installed [\#3804](https://github.com/pypeclub/OpenPype/pull/3804)
-- Resolve: Addon import is Python 2 compatible [\#3798](https://github.com/pypeclub/OpenPype/pull/3798)
 - Hiero: retimed clip publishing is working [\#3792](https://github.com/pypeclub/OpenPype/pull/3792)
 - nuke: validate write node is not failing due wrong type [\#3780](https://github.com/pypeclub/OpenPype/pull/3780)
 - Fix - changed format of version string in pyproject.toml [\#3777](https://github.com/pypeclub/OpenPype/pull/3777)
diff --git a/openpype/version.py b/openpype/version.py
index 7cd3481441..da72015423 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.14.3-nightly.6"
+__version__ = "3.14.3-nightly.7"

From 7ead2515863422887d8ecd33aaa701cdf3b5646b Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Mon, 3 Oct 2022 11:20:22 +0000
Subject: [PATCH 28/29] [Automated] Release

---
 CHANGELOG.md        | 6 +++---
 openpype/version.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35f29596a7..4ee174e1b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## [3.14.3-nightly.7](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.14.3](https://github.com/pypeclub/OpenPype/tree/3.14.3) (2022-10-03)
 
-[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.14.2...HEAD)
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.14.2...3.14.3)
 
 **🚀 Enhancements**
 
@@ -33,7 +33,6 @@
 - Tray Publisher: skip plugin if otioTimeline is missing [\#3856](https://github.com/pypeclub/OpenPype/pull/3856)
 - Flame: retimed attributes are integrated with settings [\#3855](https://github.com/pypeclub/OpenPype/pull/3855)
 - Maya: Extract Playblast fix textures + labelize viewport show settings [\#3852](https://github.com/pypeclub/OpenPype/pull/3852)
-- Resolve: Addon import is Python 2 compatible [\#3798](https://github.com/pypeclub/OpenPype/pull/3798)
 
 **🔀 Refactored code**
 
@@ -75,6 +74,7 @@
 - Launcher: Skip opening last work file works for groups [\#3822](https://github.com/pypeclub/OpenPype/pull/3822)
 - Maya: Publishing data key change [\#3811](https://github.com/pypeclub/OpenPype/pull/3811)
 - Igniter: Fix status handling when version is already installed [\#3804](https://github.com/pypeclub/OpenPype/pull/3804)
+- Resolve: Addon import is Python 2 compatible [\#3798](https://github.com/pypeclub/OpenPype/pull/3798)
 - Hiero: retimed clip publishing is working [\#3792](https://github.com/pypeclub/OpenPype/pull/3792)
 - nuke: validate write node is not failing due wrong type [\#3780](https://github.com/pypeclub/OpenPype/pull/3780)
 - Fix - changed format of version string in pyproject.toml [\#3777](https://github.com/pypeclub/OpenPype/pull/3777)
diff --git a/openpype/version.py b/openpype/version.py
index da72015423..9a6f9a54d2 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.14.3-nightly.7"
+__version__ = "3.14.3"

From b116cbf8850182731f2035b952c46bfd0b9bcbb8 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 4 Oct 2022 09:53:23 +0200
Subject: [PATCH 29/29] Fix - broken import

---
 tests/lib/testing_classes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/testing_classes.py b/tests/lib/testing_classes.py
index 85121f0d73..78a9f81095 100644
--- a/tests/lib/testing_classes.py
+++ b/tests/lib/testing_classes.py
@@ -10,7 +10,7 @@ import glob
 import platform
 
 from tests.lib.db_handler import DBHandler
-from distribution.file_handler import RemoteFileHandler
+from common.openpype_common.distribution.file_handler import RemoteFileHandler
 
 
 class BaseTest: