replace usages of avalon.tools with use classes from openpype.tools

openpype/hosts/blender/api/pipeline.py

@@ -202,13 +202,10 @@ def reload_pipeline(*args):
     avalon.api.uninstall()
 
     for module in (
-            "avalon.io",
-            "avalon.lib",
-            "avalon.pipeline",
-            "avalon.tools.creator.app",
-            "avalon.tools.manager.app",
-            "avalon.api",
-            "avalon.tools",
+        "avalon.io",
+        "avalon.lib",
+        "avalon.pipeline",
+        "avalon.api",
     ):
         module = importlib.import_module(module)
         importlib.reload(module)

openpype/hosts/maya/api/commands.py

@@ -37,17 +37,17 @@ class ToolWindows:
 
 
 def edit_shader_definitions():
-    from avalon.tools import lib
     from Qt import QtWidgets
     from openpype.hosts.maya.api.shader_definition_editor import (
         ShaderDefinitionsEditor
     )
+    from openpype.tools.utils import qt_app_context
 
     top_level_widgets = QtWidgets.QApplication.topLevelWidgets()
     main_window = next(widget for widget in top_level_widgets
                        if widget.objectName() == "MayaWindow")
 
-    with lib.application():
+    with qt_app_context():
         window = ToolWindows.get_window("shader_definition_editor")
         if not window:
             window = ShaderDefinitionsEditor(parent=main_window)

openpype/hosts/maya/api/menu.py

@@ -36,7 +36,7 @@ def install():
         return
 
     def deferred():
-        from avalon.tools import publish
+        pyblish_icon = host_tools.get_pyblish_icon()
         parent_widget = get_main_window()
         cmds.menu(
             MENU_NAME,
@@ -80,7 +80,7 @@ def install():
             command=lambda *args: host_tools.show_publish(
                 parent=parent_widget
             ),
-            image=publish.ICON
+            image=pyblish_icon
         )
 
         cmds.menuItem(

openpype/tools/mayalookassigner/widgets.py

@@ -4,8 +4,11 @@ from collections import defaultdict
 from Qt import QtWidgets, QtCore
 
 # TODO: expose this better in avalon core
-from avalon.tools import lib
-from avalon.tools.models import TreeModel
+from openpype.tools.utils.models import TreeModel
+from openpype.tools.utils.lib import (
+    preserve_expanded_rows,
+    preserve_selection,
+)
 
 from .models import (
     AssetModel,
@@ -88,8 +91,8 @@ class AssetOutliner(QtWidgets.QWidget):
         """Add all items from the current scene"""
 
         items = []
-        with lib.preserve_expanded_rows(self.view):
-            with lib.preserve_selection(self.view):
+        with preserve_expanded_rows(self.view):
+            with preserve_selection(self.view):
                 self.clear()
                 nodes = commands.get_all_asset_nodes()
                 items = commands.create_items_from_nodes(nodes)
@@ -100,8 +103,8 @@ class AssetOutliner(QtWidgets.QWidget):
     def get_selected_assets(self):
         """Add all selected items from the current scene"""
 
-        with lib.preserve_expanded_rows(self.view):
-            with lib.preserve_selection(self.view):
+        with preserve_expanded_rows(self.view):
+            with preserve_selection(self.view):
                 self.clear()
                 nodes = commands.get_selected_nodes()
                 items = commands.create_items_from_nodes(nodes)

openpype/tools/sceneinventory/model.py

@@ -8,7 +8,7 @@ from avalon import api, io, style, schema
 from avalon.vendor import qtawesome
 
 from avalon.lib import HeroVersionType
-from avalon.tools.models import TreeModel, Item
+from openpype.tools.utils.models import TreeModel, Item
 
 from .lib import (
     get_site_icons,

openpype/tools/sceneinventory/view.py

@@ -7,9 +7,13 @@ from Qt import QtWidgets, QtCore
 from avalon import io, api, style
 from avalon.vendor import qtawesome
 from avalon.lib import HeroVersionType
-from avalon.tools import lib as tools_lib
 
 from openpype.modules import ModulesManager
+from openpype.tools.utils.lib import (
+    get_progress_for_repre,
+    iter_model_rows,
+    format_version
+)
 
 from .switch_dialog import SwitchAssetDialog
 from .model import InventoryModel
@@ -373,7 +377,7 @@ class SceneInvetoryView(QtWidgets.QTreeView):
             if not repre_doc:
                 continue
 
-            progress = tools_lib.get_progress_for_repre(
+            progress = get_progress_for_repre(
                 repre_doc,
                 active_site,
                 remote_site
@@ -544,7 +548,7 @@ class SceneInvetoryView(QtWidgets.QTreeView):
             "toggle": selection_model.Toggle,
         }[options.get("mode", "select")]
 
-        for item in tools_lib.iter_model_rows(model, 0):
+        for item in iter_model_rows(model, 0):
             item = item.data(InventoryModel.ItemRole)
             if item.get("isGroupNode"):
                 continue
@@ -704,7 +708,7 @@ class SceneInvetoryView(QtWidgets.QTreeView):
         labels = []
         for version in all_versions:
             is_hero = version["type"] == "hero_version"
-            label = tools_lib.format_version(version["name"], is_hero)
+            label = format_version(version["name"], is_hero)
             labels.append(label)
             versions_by_label[label] = version["name"]
 

openpype/tools/standalonepublish/publish.py

@@ -3,10 +3,10 @@ import sys
 
 import openpype
 import pyblish.api
+from openpype.tools.utils.host_tools import show_publish
 
 
 def main(env):
-    from avalon.tools import publish
     # Registers pype's Global pyblish plugins
     openpype.install()
 
@@ -19,7 +19,7 @@ def main(env):
             continue
         pyblish.api.register_plugin_path(path)
 
-    return publish.show()
+    return show_publish()
 
 
 if __name__ == "__main__":

openpype/tools/workfiles/model.py

@@ -1,11 +1,11 @@
 import os
 import logging
 
-from Qt import QtCore, QtGui
+from Qt import QtCore
 
 from avalon import style
 from avalon.vendor import qtawesome
-from avalon.tools.models import TreeModel, Item
+from openpype.tools.utils.models import TreeModel, Item
 
 log = logging.getLogger(__name__)