Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

General: Remove remaining imports from avalon #3130

Merged
merged 2 commits into from
May 5, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openpype/hosts/blender/api/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def _load(self,
# Only containerise if it's not already a collection from a .blend file.
# representation = context["representation"]["name"]
# if representation != "blend":
# from avalon.blender.pipeline import containerise
# from openpype.hosts.blender.api.pipeline import containerise
# return containerise(
# name=name,
# namespace=namespace,
Expand Down
3 changes: 2 additions & 1 deletion openpype/hosts/fusion/api/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ def install():
This is where you install menus and register families, data
and loaders into fusion.

It is called automatically when installing via `api.install(avalon.fusion)`
It is called automatically when installing via
`openpype.pipeline.install_host(openpype.hosts.fusion.api)`

See the Maya equivalent for inspiration on how to implement this.

Expand Down
2 changes: 1 addition & 1 deletion openpype/hosts/harmony/api/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ def imprint(node_id, data, remove=False):
remove (bool): Removes the data from the scene.

Example:
>>> from avalon.harmony import lib
>>> from openpype.hosts.harmony.api import lib
>>> node = "Top/Display"
>>> data = {"str": "someting", "int": 1, "float": 0.32, "bool": True}
>>> lib.imprint(layer, data)
Expand Down
11 changes: 5 additions & 6 deletions openpype/hosts/hiero/api/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,10 @@ def eventHandler(self, event):
#
# '''
# import hiero.core
# from avalon.nuke import imprint
# from pype.hosts.nuke import (
# lib as nklib
# )
# from openpype.hosts.nuke.api.lib import (
# BuildWorkfile,
# imprint
# )
#
# # check if the file exists if does then Raise "File exists!"
# if os.path.exists(filepath):
Expand All @@ -583,8 +583,7 @@ def eventHandler(self, event):
#
# nuke_script.addNode(root_node)
#
# # here to call pype.hosts.nuke.lib.BuildWorkfile
# script_builder = nklib.BuildWorkfile(
# script_builder = BuildWorkfile(
# root_node=root_node,
# root_path=root_path,
# nodes=nuke_script.getNodes(),
Expand Down
11 changes: 5 additions & 6 deletions openpype/hosts/houdini/plugins/load/show_usdview.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import os
import subprocess

from openpype.lib.vendor_bin_utils import find_executable
from openpype.pipeline import load


Expand All @@ -14,12 +18,7 @@ class ShowInUsdview(load.LoaderPlugin):

def load(self, context, name=None, namespace=None, data=None):

import os
import subprocess

import avalon.lib as lib

usdview = lib.which("usdview")
usdview = find_executable("usdview")

filepath = os.path.normpath(self.fname)
filepath = filepath.replace("\\", "/")
Expand Down
2 changes: 1 addition & 1 deletion openpype/hosts/maya/plugins/load/_load_animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


class AbcLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
"""Specific loader of Alembic for the avalon.animation family"""
"""Loader to reference an Alembic file"""

families = ["animation",
"camera",
Expand Down
2 changes: 1 addition & 1 deletion openpype/hosts/nuke/api/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def imprint(node, data, tab=None):
Examples:
```
import nuke
from avalon.nuke import lib
from openpype.hosts.nuke.api import lib

node = nuke.createNode("NoOp")
data = {
Expand Down
2 changes: 1 addition & 1 deletion openpype/widgets/project_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

BigRoy marked this conversation as resolved.
Show resolved Hide resolved
from Qt import QtCore, QtGui, QtWidgets

from avalon import style
from openpype import style
import ftrack_api


Expand Down
2 changes: 1 addition & 1 deletion tests/lib/testing_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def dbcon(self, db_setup):

Database prepared from dumps with 'db_setup' fixture.
"""
from avalon.api import AvalonMongoDB
from openpype.pipeline import AvalonMongoDB
dbcon = AvalonMongoDB()
dbcon.Session["AVALON_PROJECT"] = self.TEST_PROJECT_NAME
yield dbcon
Expand Down