From a051a5dc4bbd81ac5c42499faccd61a36ad5a871 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 7 Mar 2022 17:42:34 +0100
Subject: [PATCH] added qtawesome and qtpy into poetry lock

---
 .../hosts/fusion/scripts/set_rendermode.py    |  2 +-
 .../hosts/fusion/utility_scripts/switch_ui.py |  2 +-
 openpype/tools/assetcreator/widget.py         |  2 +-
 openpype/tools/creator/widgets.py             |  3 +-
 openpype/tools/launcher/lib.py                |  2 +-
 openpype/tools/launcher/models.py             |  2 +-
 openpype/tools/launcher/widgets.py            |  2 +-
 openpype/tools/launcher/window.py             |  2 +-
 openpype/tools/loader/lib.py                  |  2 +-
 openpype/tools/loader/model.py                |  2 +-
 openpype/tools/mayalookassigner/models.py     |  2 +-
 .../project_manager/project_manager/style.py  |  4 +--
 openpype/tools/publisher/widgets/widgets.py   |  3 +-
 openpype/tools/pyblish_pype/model.py          |  3 +-
 openpype/tools/sceneinventory/model.py        |  4 +--
 .../tools/sceneinventory/switch_dialog.py     |  2 +-
 openpype/tools/sceneinventory/view.py         |  2 +-
 openpype/tools/sceneinventory/window.py       |  2 +-
 .../tools/settings/settings/categories.py     |  3 +-
 openpype/tools/settings/settings/widgets.py   |  2 +-
 .../standalonepublish/widgets/model_asset.py  |  2 +-
 .../widgets/model_tasks_template.py           |  2 +-
 .../standalonepublish/widgets/widget_asset.py |  2 +-
 .../widgets/widget_family_desc.py             |  6 ++--
 openpype/tools/subsetmanager/window.py        |  2 +-
 openpype/tools/utils/assets_widget.py         |  2 +-
 openpype/tools/utils/lib.py                   |  2 +-
 openpype/tools/utils/tasks_widget.py          |  3 +-
 openpype/tools/utils/widgets.py               |  2 +-
 openpype/tools/workfiles/model.py             |  2 +-
 poetry.lock                                   | 28 +++++++++++++++++++
 pyproject.toml                                |  2 ++
 32 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/openpype/hosts/fusion/scripts/set_rendermode.py b/openpype/hosts/fusion/scripts/set_rendermode.py
index 77a2d8e945..f0638e4fe3 100644
--- a/openpype/hosts/fusion/scripts/set_rendermode.py
+++ b/openpype/hosts/fusion/scripts/set_rendermode.py
@@ -1,5 +1,5 @@
 from Qt import QtWidgets
-from avalon.vendor import qtawesome
+import qtawesome
 from openpype.hosts.fusion.api import get_current_comp
 
 
diff --git a/openpype/hosts/fusion/utility_scripts/switch_ui.py b/openpype/hosts/fusion/utility_scripts/switch_ui.py
index afb39f7041..d9eeae25ea 100644
--- a/openpype/hosts/fusion/utility_scripts/switch_ui.py
+++ b/openpype/hosts/fusion/utility_scripts/switch_ui.py
@@ -6,7 +6,7 @@ from Qt import QtWidgets, QtCore
 
 import avalon.api
 from avalon import io
-from avalon.vendor import qtawesome as qta
+import qtawesome as qta
 
 from openpype import style
 from openpype.hosts.fusion import api
diff --git a/openpype/tools/assetcreator/widget.py b/openpype/tools/assetcreator/widget.py
index fd0f438e68..9ad7e19692 100644
--- a/openpype/tools/assetcreator/widget.py
+++ b/openpype/tools/assetcreator/widget.py
@@ -2,7 +2,7 @@ import logging
 import contextlib
 import collections
 
-from avalon.vendor import qtawesome
+import qtawesome
 from Qt import QtWidgets, QtCore, QtGui
 from avalon import style, io
 
diff --git a/openpype/tools/creator/widgets.py b/openpype/tools/creator/widgets.py
index 9dd435c1cc..43df08496b 100644
--- a/openpype/tools/creator/widgets.py
+++ b/openpype/tools/creator/widgets.py
@@ -3,9 +3,8 @@ import inspect
 
 from Qt import QtWidgets, QtCore, QtGui
 
-from avalon.vendor import qtawesome
+import qtawesome
 
-from openpype import style
 from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
 from openpype.tools.utils import ErrorMessageBox
 
diff --git a/openpype/tools/launcher/lib.py b/openpype/tools/launcher/lib.py
index b4e6a0c3e9..68c759f295 100644
--- a/openpype/tools/launcher/lib.py
+++ b/openpype/tools/launcher/lib.py
@@ -16,7 +16,7 @@ provides a bridge between the file-based project inventory and configuration.
 
 import os
 from Qt import QtGui
-from avalon.vendor import qtawesome
+import qtawesome
 from openpype.api import resources
 
 ICON_CACHE = {}
diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py
index effa283318..9036c9cbd5 100644
--- a/openpype/tools/launcher/models.py
+++ b/openpype/tools/launcher/models.py
@@ -7,7 +7,7 @@ import time
 
 import appdirs
 from Qt import QtCore, QtGui
-from avalon.vendor import qtawesome
+import qtawesome
 from avalon import api
 from openpype.lib import JSONSettingRegistry
 from openpype.lib.applications import (
diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py
index 30e6531843..62599664fe 100644
--- a/openpype/tools/launcher/widgets.py
+++ b/openpype/tools/launcher/widgets.py
@@ -2,7 +2,7 @@ import copy
 import time
 import collections
 from Qt import QtWidgets, QtCore, QtGui
-from avalon.vendor import qtawesome
+import qtawesome
 
 from openpype.tools.flickcharm import FlickCharm
 from openpype.tools.utils.assets_widget import SingleSelectAssetsWidget
diff --git a/openpype/tools/launcher/window.py b/openpype/tools/launcher/window.py
index b5b6368865..d80b3eabf0 100644
--- a/openpype/tools/launcher/window.py
+++ b/openpype/tools/launcher/window.py
@@ -8,7 +8,7 @@ from avalon.api import AvalonMongoDB
 from openpype import style
 from openpype.api import resources
 
-from avalon.vendor import qtawesome
+import qtawesome
 from .models import (
     LauncherModel,
     ProjectModel
diff --git a/openpype/tools/loader/lib.py b/openpype/tools/loader/lib.py
index 180dee3eb5..28e94237ec 100644
--- a/openpype/tools/loader/lib.py
+++ b/openpype/tools/loader/lib.py
@@ -1,7 +1,7 @@
 import inspect
 from Qt import QtGui
+import qtawesome
 
-from avalon.vendor import qtawesome
 from openpype.tools.utils.widgets import (
     OptionalAction,
     OptionDialog
diff --git a/openpype/tools/loader/model.py b/openpype/tools/loader/model.py
index 10b22d0e17..baee569239 100644
--- a/openpype/tools/loader/model.py
+++ b/openpype/tools/loader/model.py
@@ -8,8 +8,8 @@ from avalon import (
     schema
 )
 from Qt import QtCore, QtGui
+import qtawesome
 
-from avalon.vendor import qtawesome
 from avalon.lib import HeroVersionType
 
 from openpype.tools.utils.models import TreeModel, Item
diff --git a/openpype/tools/mayalookassigner/models.py b/openpype/tools/mayalookassigner/models.py
index 39cab83c61..386b7d7e1e 100644
--- a/openpype/tools/mayalookassigner/models.py
+++ b/openpype/tools/mayalookassigner/models.py
@@ -1,8 +1,8 @@
 from collections import defaultdict
 
 from Qt import QtCore
+import qtawesome
 
-from avalon.vendor import qtawesome
 from avalon.style import colors
 from openpype.tools.utils import models
 
diff --git a/openpype/tools/project_manager/project_manager/style.py b/openpype/tools/project_manager/project_manager/style.py
index d24fc7102f..4405d05960 100644
--- a/openpype/tools/project_manager/project_manager/style.py
+++ b/openpype/tools/project_manager/project_manager/style.py
@@ -1,7 +1,7 @@
 import os
-from Qt import QtCore, QtGui
+from Qt import QtGui
 
-from avalon.vendor import qtawesome
+import qtawesome
 from openpype.tools.utils import paint_image_with_color
 
 
diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py
index fb1f0e54aa..9a9fe3193e 100644
--- a/openpype/tools/publisher/widgets/widgets.py
+++ b/openpype/tools/publisher/widgets/widgets.py
@@ -4,8 +4,7 @@ import re
 import copy
 import collections
 from Qt import QtWidgets, QtCore, QtGui
-
-from avalon.vendor import qtawesome
+import qtawesome
 
 from openpype.widgets.attribute_defs import create_widget_for_attr_def
 from openpype.tools import resources
diff --git a/openpype/tools/pyblish_pype/model.py b/openpype/tools/pyblish_pype/model.py
index 0faadb5940..2931a379b3 100644
--- a/openpype/tools/pyblish_pype/model.py
+++ b/openpype/tools/pyblish_pype/model.py
@@ -29,10 +29,9 @@ import pyblish
 
 from . import settings, util
 from .awesome import tags as awesome
-import Qt
 from Qt import QtCore, QtGui
+import qtawesome
 from six import text_type
-from .vendor import qtawesome
 from .constants import PluginStates, InstanceStates, GroupStates, Roles
 
 from openpype.api import get_system_settings
diff --git a/openpype/tools/sceneinventory/model.py b/openpype/tools/sceneinventory/model.py
index 6435e5c488..cba60be355 100644
--- a/openpype/tools/sceneinventory/model.py
+++ b/openpype/tools/sceneinventory/model.py
@@ -4,9 +4,9 @@ import logging
 from collections import defaultdict
 
 from Qt import QtCore, QtGui
-from avalon import api, io, style, schema
-from avalon.vendor import qtawesome
+import qtawesome
 
+from avalon import api, io, style, schema
 from avalon.lib import HeroVersionType
 from openpype.tools.utils.models import TreeModel, Item
 
diff --git a/openpype/tools/sceneinventory/switch_dialog.py b/openpype/tools/sceneinventory/switch_dialog.py
index 4946c073d4..93ea68beb4 100644
--- a/openpype/tools/sceneinventory/switch_dialog.py
+++ b/openpype/tools/sceneinventory/switch_dialog.py
@@ -1,9 +1,9 @@
 import collections
 import logging
 from Qt import QtWidgets, QtCore
+import qtawesome
 
 from avalon import io, api, pipeline
-from avalon.vendor import qtawesome
 
 from .widgets import (
     ButtonWithMenu,
diff --git a/openpype/tools/sceneinventory/view.py b/openpype/tools/sceneinventory/view.py
index ec48b10e47..32c1883de6 100644
--- a/openpype/tools/sceneinventory/view.py
+++ b/openpype/tools/sceneinventory/view.py
@@ -3,9 +3,9 @@ import logging
 from functools import partial
 
 from Qt import QtWidgets, QtCore
+import qtawesome
 
 from avalon import io, api, style
-from avalon.vendor import qtawesome
 from avalon.lib import HeroVersionType
 
 from openpype.modules import ModulesManager
diff --git a/openpype/tools/sceneinventory/window.py b/openpype/tools/sceneinventory/window.py
index 095d30cac0..83e4435015 100644
--- a/openpype/tools/sceneinventory/window.py
+++ b/openpype/tools/sceneinventory/window.py
@@ -2,7 +2,7 @@ import os
 import sys
 
 from Qt import QtWidgets, QtCore
-from avalon.vendor import qtawesome
+import qtawesome
 from avalon import io, api
 
 from openpype import style
diff --git a/openpype/tools/settings/settings/categories.py b/openpype/tools/settings/settings/categories.py
index 663d497c36..a5b5cd40f0 100644
--- a/openpype/tools/settings/settings/categories.py
+++ b/openpype/tools/settings/settings/categories.py
@@ -1,9 +1,9 @@
-import os
 import sys
 import traceback
 import contextlib
 from enum import Enum
 from Qt import QtWidgets, QtCore
+import qtawesome
 
 from openpype.lib import get_openpype_version
 from openpype.tools.utils import set_style_property
@@ -63,7 +63,6 @@ from .item_widgets import (
     PathInputWidget
 )
 from .color_widget import ColorWidget
-from avalon.vendor import qtawesome
 
 
 class CategoryState(Enum):
diff --git a/openpype/tools/settings/settings/widgets.py b/openpype/tools/settings/settings/widgets.py
index f793aab057..577c2630ab 100644
--- a/openpype/tools/settings/settings/widgets.py
+++ b/openpype/tools/settings/settings/widgets.py
@@ -2,7 +2,7 @@ import os
 import copy
 import uuid
 from Qt import QtWidgets, QtCore, QtGui
-from avalon.vendor import qtawesome
+import qtawesome
 from avalon.mongodb import (
     AvalonMongoConnection,
     AvalonMongoDB
diff --git a/openpype/tools/standalonepublish/widgets/model_asset.py b/openpype/tools/standalonepublish/widgets/model_asset.py
index 60afe8f96c..6d764eff9f 100644
--- a/openpype/tools/standalonepublish/widgets/model_asset.py
+++ b/openpype/tools/standalonepublish/widgets/model_asset.py
@@ -1,8 +1,8 @@
 import logging
 import collections
 from Qt import QtCore, QtGui
+import qtawesome
 from . import TreeModel, Node
-from avalon.vendor import qtawesome
 from avalon import style
 
 
diff --git a/openpype/tools/standalonepublish/widgets/model_tasks_template.py b/openpype/tools/standalonepublish/widgets/model_tasks_template.py
index 476f45391d..1f36eaa39d 100644
--- a/openpype/tools/standalonepublish/widgets/model_tasks_template.py
+++ b/openpype/tools/standalonepublish/widgets/model_tasks_template.py
@@ -1,6 +1,6 @@
 from Qt import QtCore
+import qtawesome
 from . import Node, TreeModel
-from avalon.vendor import qtawesome
 from avalon import style
 
 
diff --git a/openpype/tools/standalonepublish/widgets/widget_asset.py b/openpype/tools/standalonepublish/widgets/widget_asset.py
index 2886d600bf..d929f227f9 100644
--- a/openpype/tools/standalonepublish/widgets/widget_asset.py
+++ b/openpype/tools/standalonepublish/widgets/widget_asset.py
@@ -1,9 +1,9 @@
 import contextlib
 from Qt import QtWidgets, QtCore
+import qtawesome
 
 from openpype.tools.utils import PlaceholderLineEdit
 
-from avalon.vendor import qtawesome
 from avalon import style
 
 from . import RecursiveSortFilterProxyModel, AssetModel
diff --git a/openpype/tools/standalonepublish/widgets/widget_family_desc.py b/openpype/tools/standalonepublish/widgets/widget_family_desc.py
index 8c95ddf2e4..79681615b9 100644
--- a/openpype/tools/standalonepublish/widgets/widget_family_desc.py
+++ b/openpype/tools/standalonepublish/widgets/widget_family_desc.py
@@ -1,7 +1,7 @@
-from Qt import QtWidgets, QtCore, QtGui
-from . import FamilyRole, PluginRole
-from avalon.vendor import qtawesome
 import six
+from Qt import QtWidgets, QtCore, QtGui
+import qtawesome
+from . import FamilyRole, PluginRole
 
 
 class FamilyDescriptionWidget(QtWidgets.QWidget):
diff --git a/openpype/tools/subsetmanager/window.py b/openpype/tools/subsetmanager/window.py
index b7430d0626..a53af52174 100644
--- a/openpype/tools/subsetmanager/window.py
+++ b/openpype/tools/subsetmanager/window.py
@@ -2,9 +2,9 @@ import os
 import sys
 
 from Qt import QtWidgets, QtCore
+import qtawesome
 
 from avalon import api
-from avalon.vendor import qtawesome
 
 from openpype import style
 from openpype.tools.utils import PlaceholderLineEdit
diff --git a/openpype/tools/utils/assets_widget.py b/openpype/tools/utils/assets_widget.py
index 17164d9e0f..d410b0f1c3 100644
--- a/openpype/tools/utils/assets_widget.py
+++ b/openpype/tools/utils/assets_widget.py
@@ -3,9 +3,9 @@ import collections
 
 import Qt
 from Qt import QtWidgets, QtCore, QtGui
+import qtawesome
 
 from avalon import style
-from avalon.vendor import qtawesome
 
 from openpype.style import get_objected_colors
 from openpype.tools.flickcharm import FlickCharm
diff --git a/openpype/tools/utils/lib.py b/openpype/tools/utils/lib.py
index 01b9e25ef3..1cbc632804 100644
--- a/openpype/tools/utils/lib.py
+++ b/openpype/tools/utils/lib.py
@@ -4,10 +4,10 @@ import contextlib
 import collections
 
 from Qt import QtWidgets, QtCore, QtGui
+import qtawesome
 
 import avalon.api
 from avalon import style
-from avalon.vendor import qtawesome
 
 from openpype.api import (
     get_project_settings,
diff --git a/openpype/tools/utils/tasks_widget.py b/openpype/tools/utils/tasks_widget.py
index 2a8a45626c..7619f59974 100644
--- a/openpype/tools/utils/tasks_widget.py
+++ b/openpype/tools/utils/tasks_widget.py
@@ -1,7 +1,7 @@
 from Qt import QtWidgets, QtCore, QtGui
+import qtawesome
 
 from avalon import style
-from avalon.vendor import qtawesome
 
 from .views import DeselectableTreeView
 
@@ -14,6 +14,7 @@ TASK_ASSIGNEE_ROLE = QtCore.Qt.UserRole + 4
 
 class TasksModel(QtGui.QStandardItemModel):
     """A model listing the tasks combined for a list of assets"""
+
     def __init__(self, dbcon, parent=None):
         super(TasksModel, self).__init__(parent=parent)
         self.dbcon = dbcon
diff --git a/openpype/tools/utils/widgets.py b/openpype/tools/utils/widgets.py
index 783736a9ca..d5ae909be8 100644
--- a/openpype/tools/utils/widgets.py
+++ b/openpype/tools/utils/widgets.py
@@ -2,7 +2,7 @@ import logging
 
 from Qt import QtWidgets, QtCore, QtGui
 import qargparse
-from avalon.vendor import qtawesome
+import qtawesome
 from openpype.style import (
     get_objected_colors,
     get_style_image_path
diff --git a/openpype/tools/workfiles/model.py b/openpype/tools/workfiles/model.py
index 3425cc3df0..b3cf5063e7 100644
--- a/openpype/tools/workfiles/model.py
+++ b/openpype/tools/workfiles/model.py
@@ -2,9 +2,9 @@ import os
 import logging
 
 from Qt import QtCore
+import qtawesome
 
 from avalon import style
-from avalon.vendor import qtawesome
 from openpype.tools.utils.models import TreeModel, Item
 
 log = logging.getLogger(__name__)
diff --git a/poetry.lock b/poetry.lock
index b6eba33e0a..a6507bb358 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1219,6 +1219,26 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "qtawesome"
+version = "0.7.3"
+description = "FontAwesome icons in PyQt and PySide applications"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+qtpy = "*"
+six = "*"
+
+[[package]]
+name = "qtpy"
+version = "1.11.3"
+description = "Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets."
+category = "main"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*"
+
 [[package]]
 name = "recommonmark"
 version = "0.7.1"
@@ -2651,6 +2671,14 @@ pywin32-ctypes = [
     {file = "Qt.py-1.3.6-py2.py3-none-any.whl", hash = "sha256:7edf6048d07a6924707506b5ba34a6e05d66dde9a3f4e3a62f9996ccab0b91c7"},
     {file = "Qt.py-1.3.6.tar.gz", hash = "sha256:0d78656a2f814602eee304521c7bf5da0cec414818b3833712c77524294c404a"},
 ]
+qtawesome = [
+    {file = "QtAwesome-0.7.3-py2.py3-none-any.whl", hash = "sha256:ddf4530b4af71cec13b24b88a4cdb56ec85b1e44c43c42d0698804c7137b09b0"},
+    {file = "QtAwesome-0.7.3.tar.gz", hash = "sha256:b98b9038d19190e83ab26d91c4d8fc3a36591ee2bc7f5016d4438b8240d097bd"},
+]
+qtpy = [
+    {file = "QtPy-1.11.3-py2.py3-none-any.whl", hash = "sha256:e121fbee8e95645af29c5a4aceba8d657991551fc1aa3b6b6012faf4725a1d20"},
+    {file = "QtPy-1.11.3.tar.gz", hash = "sha256:d427addd37386a8d786db81864a5536700861d95bf085cb31d1bea855d699557"},
+]
 recommonmark = [
     {file = "recommonmark-0.7.1-py2.py3-none-any.whl", hash = "sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f"},
     {file = "recommonmark-0.7.1.tar.gz", hash = "sha256:bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67"},
diff --git a/pyproject.toml b/pyproject.toml
index 2469cb76a9..106ae788f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,6 +50,8 @@ pyblish-base = "^1.8.8"
 pynput = "^1.7.2" # idle manager in tray
 pymongo = "^3.11.2"
 "Qt.py" = "^1.3.3"
+qtpy = "^1.11.3"
+qtawesome = "0.7.3"
 speedcopy = "^2.1"
 six = "^1.15"
 semver = "^2.13.0" # for version resolution