diff --git a/pype/__init__.py b/pype/__init__.py index 9ca0380bf32..2a922547e87 100644 --- a/pype/__init__.py +++ b/pype/__init__.py @@ -2,8 +2,8 @@ from pyblish import api as pyblish from avalon import api as avalon +from .api import config, Anatomy from .lib import filter_pyblish_plugins -from pypeapp import config, Anatomy import logging diff --git a/pype/api.py b/pype/api.py index 2c227b5b4b8..ae42bd99bae 100644 --- a/pype/api.py +++ b/pype/api.py @@ -1,5 +1,12 @@ -from .plugin import ( +from pypeapp import ( + Logger, + Anatomy, + project_overrides_dir_path, + config, + execute +) +from .plugin import ( Extractor, ValidatePipelineOrder, @@ -16,8 +23,6 @@ RepairContextAction ) -from pypeapp import Logger - from .lib import ( version_up, get_asset, @@ -33,6 +38,12 @@ from .lib import _subprocess as subprocess __all__ = [ + "Logger", + "Anatomy", + "project_overrides_dir_path", + "config", + "execute", + # plugin classes "Extractor", # ordering diff --git a/pype/hooks/premiere/prelaunch.py b/pype/hooks/premiere/prelaunch.py index f2edb60195a..c2cb73645a5 100644 --- a/pype/hooks/premiere/prelaunch.py +++ b/pype/hooks/premiere/prelaunch.py @@ -1,8 +1,8 @@ import os import traceback from pype.lib import PypeHook -from pypeapp import Logger -from pype.premiere import lib as prlib +from pype.api import Logger +from pype.hosts.premiere import lib as prlib class PremierePrelaunch(PypeHook): @@ -27,7 +27,7 @@ def execute(self, *args, env: dict = None) -> bool: env = os.environ try: - __import__("pype.premiere") + __import__("pype.hosts.premiere") __import__("pyblish") except ImportError as e: diff --git a/pype/hooks/unreal/unreal_prelaunch.py b/pype/hooks/unreal/unreal_prelaunch.py index 5b6b8e08e01..9f0cc45b96f 100644 --- a/pype/hooks/unreal/unreal_prelaunch.py +++ b/pype/hooks/unreal/unreal_prelaunch.py @@ -2,8 +2,8 @@ import os from pype.lib import PypeHook -from pype.unreal import lib as unreal_lib -from pypeapp import Logger +from pype.hosts.unreal import lib as unreal_lib +from pype.api import Logger log = logging.getLogger(__name__) diff --git a/pype/fusion/scripts/__init__.py b/pype/hosts/__init__.py similarity index 100% rename from pype/fusion/scripts/__init__.py rename to pype/hosts/__init__.py diff --git a/pype/blender/__init__.py b/pype/hosts/blender/__init__.py similarity index 88% rename from pype/blender/__init__.py rename to pype/hosts/blender/__init__.py index 4f52b4168a2..a6d3cd82ef2 100644 --- a/pype/blender/__init__.py +++ b/pype/hosts/blender/__init__.py @@ -5,9 +5,7 @@ from avalon import api as avalon from pyblish import api as pyblish -PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") +from pype import PLUGINS_DIR PUBLISH_PATH = os.path.join(PLUGINS_DIR, "blender", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "blender", "load") diff --git a/pype/blender/action.py b/pype/hosts/blender/action.py similarity index 96% rename from pype/blender/action.py rename to pype/hosts/blender/action.py index 4bd7e303fcb..78d00f56ad9 100644 --- a/pype/blender/action.py +++ b/pype/hosts/blender/action.py @@ -2,7 +2,7 @@ import pyblish.api -from ..action import get_errored_instances_from_context +from ...action import get_errored_instances_from_context class SelectInvalidAction(pyblish.api.Action): diff --git a/pype/blender/plugin.py b/pype/hosts/blender/plugin.py similarity index 100% rename from pype/blender/plugin.py rename to pype/hosts/blender/plugin.py diff --git a/pype/fusion/__init__.py b/pype/hosts/fusion/__init__.py similarity index 94% rename from pype/fusion/__init__.py rename to pype/hosts/fusion/__init__.py index d6efaa54d3c..7af75cebc8d 100644 --- a/pype/fusion/__init__.py +++ b/pype/hosts/fusion/__init__.py @@ -2,11 +2,7 @@ from avalon import api as avalon from pyblish import api as pyblish - - -PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") +from pype import PLUGINS_DIR PUBLISH_PATH = os.path.join(PLUGINS_DIR, "fusion", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "fusion", "load") diff --git a/pype/fusion/lib.py b/pype/hosts/fusion/lib.py similarity index 100% rename from pype/fusion/lib.py rename to pype/hosts/fusion/lib.py diff --git a/pype/logging/gui/__init__.py b/pype/hosts/fusion/scripts/__init__.py similarity index 100% rename from pype/logging/gui/__init__.py rename to pype/hosts/fusion/scripts/__init__.py diff --git a/pype/fusion/scripts/fusion_switch_shot.py b/pype/hosts/fusion/scripts/fusion_switch_shot.py similarity index 99% rename from pype/fusion/scripts/fusion_switch_shot.py rename to pype/hosts/fusion/scripts/fusion_switch_shot.py index 9cc572164d4..4cb20c3a616 100644 --- a/pype/fusion/scripts/fusion_switch_shot.py +++ b/pype/hosts/fusion/scripts/fusion_switch_shot.py @@ -8,8 +8,8 @@ import avalon.fusion # Config imports -import pype.lib pype -import pype.fusion.lib as fusion_lib +import pype.lib as pype +import pype.hosts.fusion.lib as fusion_lib log = logging.getLogger("Update Slap Comp") diff --git a/pype/fusion/scripts/publish_filesequence.py b/pype/hosts/fusion/scripts/publish_filesequence.py similarity index 100% rename from pype/fusion/scripts/publish_filesequence.py rename to pype/hosts/fusion/scripts/publish_filesequence.py diff --git a/pype/hosts/harmony/__init__.py b/pype/hosts/harmony/__init__.py new file mode 100644 index 00000000000..b3edca7d158 --- /dev/null +++ b/pype/hosts/harmony/__init__.py @@ -0,0 +1,39 @@ +import os + +from avalon import api, harmony +import pyblish.api + + +def install(): + print("Installing Pype config...") + + plugins_directory = os.path.join( + os.path.dirname(os.path.dirname(__file__)), "plugins", "harmony" + ) + + pyblish.api.register_plugin_path( + os.path.join(plugins_directory, "publish") + ) + api.register_plugin_path( + api.Loader, os.path.join(plugins_directory, "load") + ) + api.register_plugin_path( + api.Creator, os.path.join(plugins_directory, "create") + ) + + pyblish.api.register_callback( + "instanceToggled", on_pyblish_instance_toggled + ) + + +def on_pyblish_instance_toggled(instance, old_value, new_value): + """Toggle node enabling on instance toggles.""" + func = """function func(args) + { + node.setEnable(args[0], args[1]) + } + func + """ + harmony.send( + {"function": func, "args": [instance[0], new_value]} + ) diff --git a/pype/houdini/__init__.py b/pype/hosts/houdini/__init__.py similarity index 92% rename from pype/houdini/__init__.py rename to pype/hosts/houdini/__init__.py index 08afd97e41f..1da6a7774b2 100644 --- a/pype/houdini/__init__.py +++ b/pype/hosts/houdini/__init__.py @@ -8,20 +8,16 @@ from avalon import api as avalon from avalon.houdini import pipeline as houdini -from pype.houdini import lib +from pype.hosts.houdini import lib from pype.lib import any_outdated - - -PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") +from pype import PLUGINS_DIR PUBLISH_PATH = os.path.join(PLUGINS_DIR, "houdini", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "houdini", "load") CREATE_PATH = os.path.join(PLUGINS_DIR, "houdini", "create") -log = logging.getLogger("pype.houdini") +log = logging.getLogger("pype.hosts.houdini") def install(): diff --git a/pype/houdini/lib.py b/pype/hosts/houdini/lib.py similarity index 99% rename from pype/houdini/lib.py rename to pype/hosts/houdini/lib.py index 10b5386a2ec..5087fba9344 100644 --- a/pype/houdini/lib.py +++ b/pype/hosts/houdini/lib.py @@ -210,7 +210,7 @@ def validate_fps(): if current_fps != fps: - from ..widgets import popup + from ...widgets import popup # Find main window parent = hou.ui.mainQtWindow() diff --git a/pype/maya/__init__.py b/pype/hosts/maya/__init__.py similarity index 90% rename from pype/maya/__init__.py rename to pype/hosts/maya/__init__.py index fdc061f0698..afd2e399eb4 100644 --- a/pype/maya/__init__.py +++ b/pype/hosts/maya/__init__.py @@ -9,17 +9,13 @@ from avalon.tools import workfiles from pyblish import api as pyblish -from ..lib import ( - any_outdated -) +from ...lib import any_outdated +from pype import PLUGINS_DIR + from . import menu from . import lib -log = logging.getLogger("pype.maya") - -PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") +log = logging.getLogger("pype.hosts.maya") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "maya", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "maya", "load") @@ -30,7 +26,7 @@ def install(): pyblish.register_plugin_path(PUBLISH_PATH) avalon.register_plugin_path(avalon.Loader, LOAD_PATH) avalon.register_plugin_path(avalon.Creator, CREATE_PATH) - + log.info(PUBLISH_PATH) menu.install() log.info("Installing callbacks ... ") @@ -153,14 +149,14 @@ def on_open(_): """On scene open let's assume the containers have changed.""" from avalon.vendor.Qt import QtWidgets - from ..widgets import popup + from ...widgets import popup cmds.evalDeferred( - "from pype.maya import lib;lib.remove_render_layer_observer()") + "from pype.hosts.maya import lib;lib.remove_render_layer_observer()") cmds.evalDeferred( - "from pype.maya import lib;lib.add_render_layer_observer()") + "from pype.hosts.maya import lib;lib.add_render_layer_observer()") cmds.evalDeferred( - "from pype.maya import lib;lib.add_render_layer_change_observer()") + "from pype.hosts.maya import lib;lib.add_render_layer_change_observer()") # # Update current task for the current scene # update_task_from_path(cmds.file(query=True, sceneName=True)) @@ -200,11 +196,11 @@ def on_new(_): avalon.logger.info("Running callback on new..") with maya.suspended_refresh(): cmds.evalDeferred( - "from pype.maya import lib;lib.remove_render_layer_observer()") + "from pype.hosts.maya import lib;lib.remove_render_layer_observer()") cmds.evalDeferred( - "from pype.maya import lib;lib.add_render_layer_observer()") + "from pype.hosts.maya import lib;lib.add_render_layer_observer()") cmds.evalDeferred( - "from pype.maya import lib;lib.add_render_layer_change_observer()") + "from pype.hosts.maya import lib;lib.add_render_layer_change_observer()") lib.set_context_settings() diff --git a/pype/maya/action.py b/pype/hosts/maya/action.py similarity index 97% rename from pype/maya/action.py rename to pype/hosts/maya/action.py index 2dcdb82dc93..bb6815ed7d7 100644 --- a/pype/maya/action.py +++ b/pype/hosts/maya/action.py @@ -4,7 +4,7 @@ import pyblish.api -from ..action import get_errored_instances_from_context +from ...action import get_errored_instances_from_context class GenerateUUIDsOnInvalidAction(pyblish.api.Action): @@ -72,7 +72,7 @@ def _update_id_attribute(self, instance, nodes): nodes (list): all nodes to regenerate ids on """ - import pype.maya.lib as lib + from pype.hosts.maya import lib import avalon.io as io asset = instance.data['asset'] diff --git a/pype/maya/customize.py b/pype/hosts/maya/customize.py similarity index 100% rename from pype/maya/customize.py rename to pype/hosts/maya/customize.py diff --git a/pype/maya/lib.py b/pype/hosts/maya/lib.py similarity index 99% rename from pype/maya/lib.py rename to pype/hosts/maya/lib.py index a06810ea948..2dda198d452 100644 --- a/pype/maya/lib.py +++ b/pype/hosts/maya/lib.py @@ -1899,7 +1899,7 @@ def validate_fps(): if current_fps != fps: from avalon.vendor.Qt import QtWidgets - from ..widgets import popup + from ...widgets import popup # Find maya main window top_level_widgets = {w.objectName(): w for w in @@ -2622,7 +2622,7 @@ def update_content_on_context_change(): def show_message(title, msg): from avalon.vendor.Qt import QtWidgets - from ..widgets import message_window + from ...widgets import message_window # Find maya main window top_level_widgets = {w.objectName(): w for w in diff --git a/pype/maya/menu.json b/pype/hosts/maya/menu.json similarity index 100% rename from pype/maya/menu.json rename to pype/hosts/maya/menu.json diff --git a/pype/maya/menu.py b/pype/hosts/maya/menu.py similarity index 98% rename from pype/maya/menu.py rename to pype/hosts/maya/menu.py index 70df50b9e6b..70ad8d31ca4 100644 --- a/pype/maya/menu.py +++ b/pype/hosts/maya/menu.py @@ -4,7 +4,7 @@ from avalon.vendor.Qt import QtWidgets, QtGui from avalon.maya import pipeline -from ..lib import BuildWorkfile +from ...lib import BuildWorkfile import maya.cmds as cmds self = sys.modules[__name__] diff --git a/pype/maya/menu_backup.json b/pype/hosts/maya/menu_backup.json similarity index 100% rename from pype/maya/menu_backup.json rename to pype/hosts/maya/menu_backup.json diff --git a/pype/maya/plugin.py b/pype/hosts/maya/plugin.py similarity index 100% rename from pype/maya/plugin.py rename to pype/hosts/maya/plugin.py diff --git a/pype/nuke/__init__.py b/pype/hosts/nuke/__init__.py similarity index 89% rename from pype/nuke/__init__.py rename to pype/hosts/nuke/__init__.py index 5ab996b78ab..787f69f6351 100644 --- a/pype/nuke/__init__.py +++ b/pype/hosts/nuke/__init__.py @@ -7,8 +7,9 @@ from avalon import api as avalon from avalon.tools import workfiles from pyblish import api as pyblish -from pype.nuke import menu -from pypeapp import Logger +from pype.hosts.nuke import menu +from pype.api import Logger +from pype import PLUGINS_DIR from . import lib @@ -18,10 +19,6 @@ AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") -PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") - PUBLISH_PATH = os.path.join(PLUGINS_DIR, "nuke", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "nuke", "load") CREATE_PATH = os.path.join(PLUGINS_DIR, "nuke", "create") @@ -44,11 +41,11 @@ def reload_config(): for module in ( "{}.api".format(AVALON_CONFIG), - "{}.nuke.actions".format(AVALON_CONFIG), - "{}.nuke.presets".format(AVALON_CONFIG), - "{}.nuke.menu".format(AVALON_CONFIG), - "{}.nuke.plugin".format(AVALON_CONFIG), - "{}.nuke.lib".format(AVALON_CONFIG), + "{}.hosts.nuke.actions".format(AVALON_CONFIG), + "{}.hosts.nuke.presets".format(AVALON_CONFIG), + "{}.hosts.nuke.menu".format(AVALON_CONFIG), + "{}.hosts.nuke.plugin".format(AVALON_CONFIG), + "{}.hosts.nuke.lib".format(AVALON_CONFIG), ): log.info("Reloading module: {}...".format(module)) diff --git a/pype/nuke/actions.py b/pype/hosts/nuke/actions.py similarity index 96% rename from pype/nuke/actions.py rename to pype/hosts/nuke/actions.py index c0c95e9080a..23242262c80 100644 --- a/pype/nuke/actions.py +++ b/pype/hosts/nuke/actions.py @@ -5,7 +5,7 @@ select_nodes ) -from ..action import get_errored_instances_from_context +from ...action import get_errored_instances_from_context class SelectInvalidAction(pyblish.api.Action): diff --git a/pype/nuke/lib.py b/pype/hosts/nuke/lib.py similarity index 99% rename from pype/nuke/lib.py rename to pype/hosts/nuke/lib.py index ade7e966911..72a8836a03e 100644 --- a/pype/nuke/lib.py +++ b/pype/hosts/nuke/lib.py @@ -21,8 +21,7 @@ from .utils import set_context_favorites -from pypeapp import Logger -log = Logger().get_logger(__name__, "nuke") +log = pype.Logger().get_logger(__name__, "nuke") self = sys.modules[__name__] self._project = None diff --git a/pype/nuke/menu.py b/pype/hosts/nuke/menu.py similarity index 97% rename from pype/nuke/menu.py rename to pype/hosts/nuke/menu.py index 43c775414ad..7306add9fe5 100644 --- a/pype/nuke/menu.py +++ b/pype/hosts/nuke/menu.py @@ -1,8 +1,8 @@ import nuke from avalon.api import Session -from pype.nuke import lib -from pypeapp import Logger +from pype.hosts.nuke import lib +from pype.api import Logger log = Logger().get_logger(__name__, "nuke") diff --git a/pype/nuke/plugin.py b/pype/hosts/nuke/plugin.py similarity index 86% rename from pype/nuke/plugin.py rename to pype/hosts/nuke/plugin.py index d4b5110d6e9..652c0396a8c 100644 --- a/pype/nuke/plugin.py +++ b/pype/hosts/nuke/plugin.py @@ -1,8 +1,7 @@ import re import avalon.api import avalon.nuke -from pype import api as pype -from pypeapp import config +from pype.api import config class PypeCreator(avalon.nuke.pipeline.Creator): """Pype Nuke Creator class wrapper diff --git a/pype/nuke/presets.py b/pype/hosts/nuke/presets.py similarity index 94% rename from pype/nuke/presets.py rename to pype/hosts/nuke/presets.py index a413ccc8788..2a296afc88b 100644 --- a/pype/nuke/presets.py +++ b/pype/hosts/nuke/presets.py @@ -1,8 +1,7 @@ -from pype import api as pype -from pypeapp import Anatomy, config +from pype.api import Anatomy, config, Logger import nuke -log = pype.Logger().get_logger(__name__, "nuke") +log = Logger().get_logger(__name__, "nuke") def get_anatomy(**kwarg): diff --git a/pype/nuke/utils.py b/pype/hosts/nuke/utils.py similarity index 100% rename from pype/nuke/utils.py rename to pype/hosts/nuke/utils.py diff --git a/pype/nukestudio/__init__.py b/pype/hosts/nukestudio/__init__.py similarity index 95% rename from pype/nukestudio/__init__.py rename to pype/hosts/nukestudio/__init__.py index 75825d188a7..c84b288f4ac 100644 --- a/pype/nukestudio/__init__.py +++ b/pype/hosts/nukestudio/__init__.py @@ -1,7 +1,8 @@ import os -from pypeapp import Logger +from pype.api import Logger from avalon import api as avalon from pyblish import api as pyblish +from pype import PLUGINS_DIR from .workio import ( open_file, @@ -37,10 +38,6 @@ AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") # plugin root path -PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") - PUBLISH_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "load") CREATE_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "create") diff --git a/pype/nukestudio/events.py b/pype/hosts/nukestudio/events.py similarity index 99% rename from pype/nukestudio/events.py rename to pype/hosts/nukestudio/events.py index 822dc4db87d..509319f717a 100644 --- a/pype/nukestudio/events.py +++ b/pype/hosts/nukestudio/events.py @@ -1,6 +1,6 @@ import os import hiero.core.events -from pypeapp import Logger +from pype.api import Logger from .lib import sync_avalon_data_to_workfile, launch_workfiles_app from .tags import add_tags_from_presets diff --git a/pype/nukestudio/lib.py b/pype/hosts/nukestudio/lib.py similarity index 98% rename from pype/nukestudio/lib.py rename to pype/hosts/nukestudio/lib.py index 3a8e35f1005..6f2d9ad357d 100644 --- a/pype/nukestudio/lib.py +++ b/pype/hosts/nukestudio/lib.py @@ -6,7 +6,7 @@ import avalon.api as avalon from avalon.vendor.Qt import (QtWidgets, QtGui) import pype.api as pype -from pypeapp import Logger, Anatomy +from pype.api import Logger, Anatomy log = Logger().get_logger(__name__, "nukestudio") @@ -109,9 +109,9 @@ def reload_config(): "pypeapp", "{}.api".format(AVALON_CONFIG), "{}.templates".format(AVALON_CONFIG), - "{}.nukestudio.lib".format(AVALON_CONFIG), - "{}.nukestudio.menu".format(AVALON_CONFIG), - "{}.nukestudio.tags".format(AVALON_CONFIG) + "{}.hosts.nukestudio.lib".format(AVALON_CONFIG), + "{}.hosts.nukestudio.menu".format(AVALON_CONFIG), + "{}.hosts.nukestudio.tags".format(AVALON_CONFIG) ): log.info("Reloading module: {}...".format(module)) try: @@ -332,7 +332,7 @@ def CreateNukeWorkfile(nodes=None, ''' import hiero.core from avalon.nuke import imprint - from pype.nuke import ( + from pype.hosts.nuke import ( lib as nklib ) @@ -361,7 +361,7 @@ def CreateNukeWorkfile(nodes=None, nuke_script.addNode(root_node) - # here to call pype.nuke.lib.BuildWorkfile + # here to call pype.hosts.nuke.lib.BuildWorkfile script_builder = nklib.BuildWorkfile( root_node=root_node, root_path=root_path, diff --git a/pype/nukestudio/menu.py b/pype/hosts/nukestudio/menu.py similarity index 99% rename from pype/nukestudio/menu.py rename to pype/hosts/nukestudio/menu.py index ee9af44e747..35adcfc16c3 100644 --- a/pype/nukestudio/menu.py +++ b/pype/hosts/nukestudio/menu.py @@ -1,7 +1,7 @@ import os import sys import hiero.core -from pypeapp import Logger +from pype.api import Logger from avalon.api import Session from hiero.ui import findMenuAction diff --git a/pype/nukestudio/tags.py b/pype/hosts/nukestudio/tags.py similarity index 99% rename from pype/nukestudio/tags.py rename to pype/hosts/nukestudio/tags.py index 3a15f9f39e2..c97f13d17cc 100644 --- a/pype/nukestudio/tags.py +++ b/pype/hosts/nukestudio/tags.py @@ -2,7 +2,7 @@ import os import hiero -from pypeapp import ( +from pype.api import ( config, Logger ) diff --git a/pype/nukestudio/workio.py b/pype/hosts/nukestudio/workio.py similarity index 98% rename from pype/nukestudio/workio.py rename to pype/hosts/nukestudio/workio.py index 1c7c77dab9f..eee6654a4c7 100644 --- a/pype/nukestudio/workio.py +++ b/pype/hosts/nukestudio/workio.py @@ -1,7 +1,7 @@ import os import hiero from avalon import api -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger(__name__, "nukestudio") diff --git a/pype/premiere/README.markdown b/pype/hosts/premiere/README.markdown similarity index 100% rename from pype/premiere/README.markdown rename to pype/hosts/premiere/README.markdown diff --git a/pype/premiere/__init__.py b/pype/hosts/premiere/__init__.py similarity index 96% rename from pype/premiere/__init__.py rename to pype/hosts/premiere/__init__.py index 9dfe2ec3842..ddf334c6107 100644 --- a/pype/premiere/__init__.py +++ b/pype/hosts/premiere/__init__.py @@ -1,7 +1,7 @@ import os from avalon import api as avalon from pyblish import api as pyblish -from pypeapp import Logger +from pype.api import Logger from .lib import ( @@ -42,7 +42,7 @@ def install(): avalon.data["familiesStateDefault"] = False avalon.data["familiesStateToggled"] = family_states - log.info("pype.premiere installed") + log.info("pype.hosts.premiere installed") pyblish.register_host("premiere") pyblish.register_plugin_path(PUBLISH_PATH) diff --git a/pype/premiere/extensions/build_extension.bat b/pype/hosts/premiere/extensions/build_extension.bat similarity index 100% rename from pype/premiere/extensions/build_extension.bat rename to pype/hosts/premiere/extensions/build_extension.bat diff --git a/pype/premiere/extensions/com.pype.rename/.debug b/pype/hosts/premiere/extensions/com.pype.rename/.debug similarity index 100% rename from pype/premiere/extensions/com.pype.rename/.debug rename to pype/hosts/premiere/extensions/com.pype.rename/.debug diff --git a/pype/premiere/extensions/com.pype.rename/CSXS/manifest.xml b/pype/hosts/premiere/extensions/com.pype.rename/CSXS/manifest.xml similarity index 100% rename from pype/premiere/extensions/com.pype.rename/CSXS/manifest.xml rename to pype/hosts/premiere/extensions/com.pype.rename/CSXS/manifest.xml diff --git a/pype/premiere/extensions/com.pype.rename/ReadMe.md b/pype/hosts/premiere/extensions/com.pype.rename/ReadMe.md similarity index 100% rename from pype/premiere/extensions/com.pype.rename/ReadMe.md rename to pype/hosts/premiere/extensions/com.pype.rename/ReadMe.md diff --git a/pype/premiere/extensions/com.pype.rename/css/bootstrap.min.css b/pype/hosts/premiere/extensions/com.pype.rename/css/bootstrap.min.css similarity index 100% rename from pype/premiere/extensions/com.pype.rename/css/bootstrap.min.css rename to pype/hosts/premiere/extensions/com.pype.rename/css/bootstrap.min.css diff --git a/pype/premiere/extensions/com.pype.rename/css/bootstrap.min.css.map b/pype/hosts/premiere/extensions/com.pype.rename/css/bootstrap.min.css.map similarity index 100% rename from pype/premiere/extensions/com.pype.rename/css/bootstrap.min.css.map rename to pype/hosts/premiere/extensions/com.pype.rename/css/bootstrap.min.css.map diff --git a/pype/premiere/extensions/com.pype.rename/css/renamer.min.css b/pype/hosts/premiere/extensions/com.pype.rename/css/renamer.min.css similarity index 100% rename from pype/premiere/extensions/com.pype.rename/css/renamer.min.css rename to pype/hosts/premiere/extensions/com.pype.rename/css/renamer.min.css diff --git a/pype/premiere/extensions/com.pype.rename/css/renamer.min.css.map b/pype/hosts/premiere/extensions/com.pype.rename/css/renamer.min.css.map similarity index 100% rename from pype/premiere/extensions/com.pype.rename/css/renamer.min.css.map rename to pype/hosts/premiere/extensions/com.pype.rename/css/renamer.min.css.map diff --git a/pype/premiere/extensions/com.pype.rename/css/renamer.scss b/pype/hosts/premiere/extensions/com.pype.rename/css/renamer.scss similarity index 100% rename from pype/premiere/extensions/com.pype.rename/css/renamer.scss rename to pype/hosts/premiere/extensions/com.pype.rename/css/renamer.scss diff --git a/pype/premiere/extensions/com.pype.rename/index.html b/pype/hosts/premiere/extensions/com.pype.rename/index.html similarity index 100% rename from pype/premiere/extensions/com.pype.rename/index.html rename to pype/hosts/premiere/extensions/com.pype.rename/index.html diff --git a/pype/premiere/extensions/com.pype.rename/jsx/PPRO/Premiere.jsx b/pype/hosts/premiere/extensions/com.pype.rename/jsx/PPRO/Premiere.jsx similarity index 100% rename from pype/premiere/extensions/com.pype.rename/jsx/PPRO/Premiere.jsx rename to pype/hosts/premiere/extensions/com.pype.rename/jsx/PPRO/Premiere.jsx diff --git a/pype/premiere/extensions/com.pype.rename/jsx/PypeRename.jsx b/pype/hosts/premiere/extensions/com.pype.rename/jsx/PypeRename.jsx similarity index 100% rename from pype/premiere/extensions/com.pype.rename/jsx/PypeRename.jsx rename to pype/hosts/premiere/extensions/com.pype.rename/jsx/PypeRename.jsx diff --git a/pype/premiere/extensions/com.pype.rename/lib/CEPEngine_extensions.js b/pype/hosts/premiere/extensions/com.pype.rename/lib/CEPEngine_extensions.js similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/CEPEngine_extensions.js rename to pype/hosts/premiere/extensions/com.pype.rename/lib/CEPEngine_extensions.js diff --git a/pype/premiere/extensions/com.pype.rename/lib/CSInterface.js b/pype/hosts/premiere/extensions/com.pype.rename/lib/CSInterface.js similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/CSInterface.js rename to pype/hosts/premiere/extensions/com.pype.rename/lib/CSInterface.js diff --git a/pype/premiere/extensions/com.pype.rename/lib/Vulcan.js b/pype/hosts/premiere/extensions/com.pype.rename/lib/Vulcan.js similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/Vulcan.js rename to pype/hosts/premiere/extensions/com.pype.rename/lib/Vulcan.js diff --git a/pype/premiere/extensions/com.pype.rename/lib/bootstrap.min.js b/pype/hosts/premiere/extensions/com.pype.rename/lib/bootstrap.min.js similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/bootstrap.min.js rename to pype/hosts/premiere/extensions/com.pype.rename/lib/bootstrap.min.js diff --git a/pype/premiere/extensions/com.pype.rename/lib/bootstrap.min.js.map b/pype/hosts/premiere/extensions/com.pype.rename/lib/bootstrap.min.js.map similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/bootstrap.min.js.map rename to pype/hosts/premiere/extensions/com.pype.rename/lib/bootstrap.min.js.map diff --git a/pype/premiere/extensions/com.pype.rename/lib/jquery-3.3.1.min.js b/pype/hosts/premiere/extensions/com.pype.rename/lib/jquery-3.3.1.min.js similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/jquery-3.3.1.min.js rename to pype/hosts/premiere/extensions/com.pype.rename/lib/jquery-3.3.1.min.js diff --git a/pype/premiere/extensions/com.pype.rename/lib/popper.min.js b/pype/hosts/premiere/extensions/com.pype.rename/lib/popper.min.js similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/popper.min.js rename to pype/hosts/premiere/extensions/com.pype.rename/lib/popper.min.js diff --git a/pype/premiere/extensions/com.pype.rename/lib/renamer.js b/pype/hosts/premiere/extensions/com.pype.rename/lib/renamer.js similarity index 100% rename from pype/premiere/extensions/com.pype.rename/lib/renamer.js rename to pype/hosts/premiere/extensions/com.pype.rename/lib/renamer.js diff --git a/pype/premiere/extensions/com.pype/.debug b/pype/hosts/premiere/extensions/com.pype/.debug similarity index 100% rename from pype/premiere/extensions/com.pype/.debug rename to pype/hosts/premiere/extensions/com.pype/.debug diff --git a/pype/premiere/extensions/com.pype/CSXS/manifest.xml b/pype/hosts/premiere/extensions/com.pype/CSXS/manifest.xml similarity index 100% rename from pype/premiere/extensions/com.pype/CSXS/manifest.xml rename to pype/hosts/premiere/extensions/com.pype/CSXS/manifest.xml diff --git a/pype/premiere/extensions/com.pype/encoding/44khz.epr b/pype/hosts/premiere/extensions/com.pype/encoding/44khz.epr similarity index 100% rename from pype/premiere/extensions/com.pype/encoding/44khz.epr rename to pype/hosts/premiere/extensions/com.pype/encoding/44khz.epr diff --git a/pype/premiere/extensions/com.pype/encoding/48khz.epr b/pype/hosts/premiere/extensions/com.pype/encoding/48khz.epr similarity index 100% rename from pype/premiere/extensions/com.pype/encoding/48khz.epr rename to pype/hosts/premiere/extensions/com.pype/encoding/48khz.epr diff --git a/pype/premiere/extensions/com.pype/encoding/h264.epr b/pype/hosts/premiere/extensions/com.pype/encoding/h264.epr similarity index 100% rename from pype/premiere/extensions/com.pype/encoding/h264.epr rename to pype/hosts/premiere/extensions/com.pype/encoding/h264.epr diff --git a/pype/premiere/extensions/com.pype/encoding/jpeg_thumb.epr b/pype/hosts/premiere/extensions/com.pype/encoding/jpeg_thumb.epr similarity index 100% rename from pype/premiere/extensions/com.pype/encoding/jpeg_thumb.epr rename to pype/hosts/premiere/extensions/com.pype/encoding/jpeg_thumb.epr diff --git a/pype/premiere/extensions/com.pype/encoding/prores422.epr b/pype/hosts/premiere/extensions/com.pype/encoding/prores422.epr similarity index 100% rename from pype/premiere/extensions/com.pype/encoding/prores422.epr rename to pype/hosts/premiere/extensions/com.pype/encoding/prores422.epr diff --git a/pype/premiere/extensions/com.pype/icons/iconDarkNormal.png b/pype/hosts/premiere/extensions/com.pype/icons/iconDarkNormal.png similarity index 100% rename from pype/premiere/extensions/com.pype/icons/iconDarkNormal.png rename to pype/hosts/premiere/extensions/com.pype/icons/iconDarkNormal.png diff --git a/pype/premiere/extensions/com.pype/icons/iconDarkRollover.png b/pype/hosts/premiere/extensions/com.pype/icons/iconDarkRollover.png similarity index 100% rename from pype/premiere/extensions/com.pype/icons/iconDarkRollover.png rename to pype/hosts/premiere/extensions/com.pype/icons/iconDarkRollover.png diff --git a/pype/premiere/extensions/com.pype/icons/iconDisabled.png b/pype/hosts/premiere/extensions/com.pype/icons/iconDisabled.png similarity index 100% rename from pype/premiere/extensions/com.pype/icons/iconDisabled.png rename to pype/hosts/premiere/extensions/com.pype/icons/iconDisabled.png diff --git a/pype/premiere/extensions/com.pype/icons/iconNormal.png b/pype/hosts/premiere/extensions/com.pype/icons/iconNormal.png similarity index 100% rename from pype/premiere/extensions/com.pype/icons/iconNormal.png rename to pype/hosts/premiere/extensions/com.pype/icons/iconNormal.png diff --git a/pype/premiere/extensions/com.pype/icons/iconRollover.png b/pype/hosts/premiere/extensions/com.pype/icons/iconRollover.png similarity index 100% rename from pype/premiere/extensions/com.pype/icons/iconRollover.png rename to pype/hosts/premiere/extensions/com.pype/icons/iconRollover.png diff --git a/pype/premiere/extensions/com.pype/index_remote.html b/pype/hosts/premiere/extensions/com.pype/index_remote.html similarity index 100% rename from pype/premiere/extensions/com.pype/index_remote.html rename to pype/hosts/premiere/extensions/com.pype/index_remote.html diff --git a/pype/premiere/extensions/com.pype/jsx/JavaScript.d.ts b/pype/hosts/premiere/extensions/com.pype/jsx/JavaScript.d.ts similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/JavaScript.d.ts rename to pype/hosts/premiere/extensions/com.pype/jsx/JavaScript.d.ts diff --git a/pype/premiere/extensions/com.pype/jsx/PPRO/Premiere.jsx b/pype/hosts/premiere/extensions/com.pype/jsx/PPRO/Premiere.jsx similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/PPRO/Premiere.jsx rename to pype/hosts/premiere/extensions/com.pype/jsx/PPRO/Premiere.jsx diff --git a/pype/premiere/extensions/com.pype/jsx/PlugPlugExternalObject.d.ts b/pype/hosts/premiere/extensions/com.pype/jsx/PlugPlugExternalObject.d.ts similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/PlugPlugExternalObject.d.ts rename to pype/hosts/premiere/extensions/com.pype/jsx/PlugPlugExternalObject.d.ts diff --git a/pype/premiere/extensions/com.pype/jsx/PremierePro.14.0.d.ts b/pype/hosts/premiere/extensions/com.pype/jsx/PremierePro.14.0.d.ts similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/PremierePro.14.0.d.ts rename to pype/hosts/premiere/extensions/com.pype/jsx/PremierePro.14.0.d.ts diff --git a/pype/premiere/extensions/com.pype/jsx/PypeRename.jsx b/pype/hosts/premiere/extensions/com.pype/jsx/PypeRename.jsx similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/PypeRename.jsx rename to pype/hosts/premiere/extensions/com.pype/jsx/PypeRename.jsx diff --git a/pype/premiere/extensions/com.pype/jsx/XMPScript.d.ts b/pype/hosts/premiere/extensions/com.pype/jsx/XMPScript.d.ts similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/XMPScript.d.ts rename to pype/hosts/premiere/extensions/com.pype/jsx/XMPScript.d.ts diff --git a/pype/premiere/extensions/com.pype/jsx/batchRenamer.jsx b/pype/hosts/premiere/extensions/com.pype/jsx/batchRenamer.jsx similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/batchRenamer.jsx rename to pype/hosts/premiere/extensions/com.pype/jsx/batchRenamer.jsx diff --git a/pype/premiere/extensions/com.pype/jsx/extendscript.d.ts b/pype/hosts/premiere/extensions/com.pype/jsx/extendscript.d.ts similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/extendscript.d.ts rename to pype/hosts/premiere/extensions/com.pype/jsx/extendscript.d.ts diff --git a/pype/premiere/extensions/com.pype/jsx/global.d.ts b/pype/hosts/premiere/extensions/com.pype/jsx/global.d.ts similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/global.d.ts rename to pype/hosts/premiere/extensions/com.pype/jsx/global.d.ts diff --git a/pype/premiere/extensions/com.pype/jsx/jsconfig.json b/pype/hosts/premiere/extensions/com.pype/jsx/jsconfig.json similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/jsconfig.json rename to pype/hosts/premiere/extensions/com.pype/jsx/jsconfig.json diff --git a/pype/premiere/extensions/com.pype/jsx/pype.jsx b/pype/hosts/premiere/extensions/com.pype/jsx/pype.jsx similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/pype.jsx rename to pype/hosts/premiere/extensions/com.pype/jsx/pype.jsx diff --git a/pype/premiere/extensions/com.pype/jsx/testingCode._jsx b/pype/hosts/premiere/extensions/com.pype/jsx/testingCode._jsx similarity index 100% rename from pype/premiere/extensions/com.pype/jsx/testingCode._jsx rename to pype/hosts/premiere/extensions/com.pype/jsx/testingCode._jsx diff --git a/pype/premiere/extensions/com.pype/lib/CEPEngine_extensions.js b/pype/hosts/premiere/extensions/com.pype/lib/CEPEngine_extensions.js similarity index 100% rename from pype/premiere/extensions/com.pype/lib/CEPEngine_extensions.js rename to pype/hosts/premiere/extensions/com.pype/lib/CEPEngine_extensions.js diff --git a/pype/premiere/extensions/com.pype/lib/CSInterface.js b/pype/hosts/premiere/extensions/com.pype/lib/CSInterface.js similarity index 100% rename from pype/premiere/extensions/com.pype/lib/CSInterface.js rename to pype/hosts/premiere/extensions/com.pype/lib/CSInterface.js diff --git a/pype/premiere/extensions/com.pype/lib/Vulcan.js b/pype/hosts/premiere/extensions/com.pype/lib/Vulcan.js similarity index 100% rename from pype/premiere/extensions/com.pype/lib/Vulcan.js rename to pype/hosts/premiere/extensions/com.pype/lib/Vulcan.js diff --git a/pype/premiere/extensions/com.pype/lib/app.js b/pype/hosts/premiere/extensions/com.pype/lib/app.js similarity index 100% rename from pype/premiere/extensions/com.pype/lib/app.js rename to pype/hosts/premiere/extensions/com.pype/lib/app.js diff --git a/pype/premiere/extensions/com.pype/lib/jquery-1.9.1.js b/pype/hosts/premiere/extensions/com.pype/lib/jquery-1.9.1.js similarity index 100% rename from pype/premiere/extensions/com.pype/lib/jquery-1.9.1.js rename to pype/hosts/premiere/extensions/com.pype/lib/jquery-1.9.1.js diff --git a/pype/premiere/extensions/com.pype/lib/json2.js b/pype/hosts/premiere/extensions/com.pype/lib/json2.js similarity index 100% rename from pype/premiere/extensions/com.pype/lib/json2.js rename to pype/hosts/premiere/extensions/com.pype/lib/json2.js diff --git a/pype/premiere/extensions/com.pype/package.json b/pype/hosts/premiere/extensions/com.pype/package.json similarity index 100% rename from pype/premiere/extensions/com.pype/package.json rename to pype/hosts/premiere/extensions/com.pype/package.json diff --git a/pype/premiere/extensions/com.pype/pypeApp.jsx b/pype/hosts/premiere/extensions/com.pype/pypeApp.jsx similarity index 100% rename from pype/premiere/extensions/com.pype/pypeApp.jsx rename to pype/hosts/premiere/extensions/com.pype/pypeApp.jsx diff --git a/pype/premiere/lib.py b/pype/hosts/premiere/lib.py similarity index 96% rename from pype/premiere/lib.py rename to pype/hosts/premiere/lib.py index f03c98fb78b..d76d27270ae 100644 --- a/pype/premiere/lib.py +++ b/pype/hosts/premiere/lib.py @@ -7,8 +7,8 @@ from avalon import api from pype.widgets.message_window import message -from pypeapp import Logger - +from pype import PLUGINS_DIR +from pype.api import Logger log = Logger().get_logger(__name__, "premiere") @@ -19,8 +19,6 @@ AVALON_CONFIG = os.environ["AVALON_CONFIG"] PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") self.EXTENSIONS_PATH_REMOTE = os.path.join(PARENT_DIR, "extensions") self.EXTENSIONS_PATH_LOCAL = None @@ -58,7 +56,7 @@ def reload_pipeline(): """ import importlib - import pype.premiere + import pype.hosts.premiere api.uninstall() @@ -79,7 +77,7 @@ def reload_pipeline(): except Exception as e: log.warning("Cannot reload module: {}".format(e)) - api.install(pype.premiere) + api.install(pype.hosts.premiere) def setup(env=None): @@ -121,7 +119,7 @@ def extensions_sync(): # https://helpx.adobe.com/extension-manager/using/command-line.html process_pairs = list() - # get extensions dir in pype.premiere.extensions + # get extensions dir in pype.hosts.premiere.extensions # build dir path to premiere cep extensions for name in os.listdir(self.EXTENSIONS_PATH_REMOTE): diff --git a/pype/premiere/ppro/css/avalon.min.css b/pype/hosts/premiere/ppro/css/avalon.min.css similarity index 100% rename from pype/premiere/ppro/css/avalon.min.css rename to pype/hosts/premiere/ppro/css/avalon.min.css diff --git a/pype/premiere/ppro/css/avalon.min.css.map b/pype/hosts/premiere/ppro/css/avalon.min.css.map similarity index 100% rename from pype/premiere/ppro/css/avalon.min.css.map rename to pype/hosts/premiere/ppro/css/avalon.min.css.map diff --git a/pype/premiere/ppro/css/avalon.scss b/pype/hosts/premiere/ppro/css/avalon.scss similarity index 100% rename from pype/premiere/ppro/css/avalon.scss rename to pype/hosts/premiere/ppro/css/avalon.scss diff --git a/pype/premiere/ppro/css/bootstrap.min.css b/pype/hosts/premiere/ppro/css/bootstrap.min.css similarity index 100% rename from pype/premiere/ppro/css/bootstrap.min.css rename to pype/hosts/premiere/ppro/css/bootstrap.min.css diff --git a/pype/premiere/ppro/css/bootstrap.min.css.map b/pype/hosts/premiere/ppro/css/bootstrap.min.css.map similarity index 100% rename from pype/premiere/ppro/css/bootstrap.min.css.map rename to pype/hosts/premiere/ppro/css/bootstrap.min.css.map diff --git a/pype/premiere/ppro/debug.log b/pype/hosts/premiere/ppro/debug.log similarity index 100% rename from pype/premiere/ppro/debug.log rename to pype/hosts/premiere/ppro/debug.log diff --git a/pype/premiere/ppro/img/blender.png b/pype/hosts/premiere/ppro/img/blender.png similarity index 100% rename from pype/premiere/ppro/img/blender.png rename to pype/hosts/premiere/ppro/img/blender.png diff --git a/pype/premiere/ppro/index.html b/pype/hosts/premiere/ppro/index.html similarity index 100% rename from pype/premiere/ppro/index.html rename to pype/hosts/premiere/ppro/index.html diff --git a/pype/premiere/ppro/js/.eslintrc.json b/pype/hosts/premiere/ppro/js/.eslintrc.json similarity index 100% rename from pype/premiere/ppro/js/.eslintrc.json rename to pype/hosts/premiere/ppro/js/.eslintrc.json diff --git a/pype/premiere/ppro/js/build.js b/pype/hosts/premiere/ppro/js/build.js similarity index 100% rename from pype/premiere/ppro/js/build.js rename to pype/hosts/premiere/ppro/js/build.js diff --git a/pype/premiere/ppro/js/pype.js b/pype/hosts/premiere/ppro/js/pype.js similarity index 100% rename from pype/premiere/ppro/js/pype.js rename to pype/hosts/premiere/ppro/js/pype.js diff --git a/pype/premiere/ppro/js/pype_restapi_client.js b/pype/hosts/premiere/ppro/js/pype_restapi_client.js similarity index 100% rename from pype/premiere/ppro/js/pype_restapi_client.js rename to pype/hosts/premiere/ppro/js/pype_restapi_client.js diff --git a/pype/premiere/ppro/js/vendor/CSInterface-8.js b/pype/hosts/premiere/ppro/js/vendor/CSInterface-8.js similarity index 100% rename from pype/premiere/ppro/js/vendor/CSInterface-8.js rename to pype/hosts/premiere/ppro/js/vendor/CSInterface-8.js diff --git a/pype/premiere/ppro/js/vendor/bootstrap.min.js b/pype/hosts/premiere/ppro/js/vendor/bootstrap.min.js similarity index 100% rename from pype/premiere/ppro/js/vendor/bootstrap.min.js rename to pype/hosts/premiere/ppro/js/vendor/bootstrap.min.js diff --git a/pype/premiere/ppro/js/vendor/bootstrap.min.js.map b/pype/hosts/premiere/ppro/js/vendor/bootstrap.min.js.map similarity index 100% rename from pype/premiere/ppro/js/vendor/bootstrap.min.js.map rename to pype/hosts/premiere/ppro/js/vendor/bootstrap.min.js.map diff --git a/pype/premiere/ppro/js/vendor/jquery-3.3.1.min.js b/pype/hosts/premiere/ppro/js/vendor/jquery-3.3.1.min.js similarity index 100% rename from pype/premiere/ppro/js/vendor/jquery-3.3.1.min.js rename to pype/hosts/premiere/ppro/js/vendor/jquery-3.3.1.min.js diff --git a/pype/premiere/ppro/js/vendor/json2.js b/pype/hosts/premiere/ppro/js/vendor/json2.js similarity index 100% rename from pype/premiere/ppro/js/vendor/json2.js rename to pype/hosts/premiere/ppro/js/vendor/json2.js diff --git a/pype/premiere/ppro/js/vendor/popper.min.js b/pype/hosts/premiere/ppro/js/vendor/popper.min.js similarity index 100% rename from pype/premiere/ppro/js/vendor/popper.min.js rename to pype/hosts/premiere/ppro/js/vendor/popper.min.js diff --git a/pype/unreal/__init__.py b/pype/hosts/unreal/__init__.py similarity index 86% rename from pype/unreal/__init__.py rename to pype/hosts/unreal/__init__.py index bb8a765a43f..939be48d1e0 100644 --- a/pype/unreal/__init__.py +++ b/pype/hosts/unreal/__init__.py @@ -3,12 +3,9 @@ from avalon import api as avalon from pyblish import api as pyblish +from pype import PLUGINS_DIR -logger = logging.getLogger("pype.unreal") - -PARENT_DIR = os.path.dirname(__file__) -PACKAGE_DIR = os.path.dirname(PARENT_DIR) -PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") +logger = logging.getLogger("pype.hosts.unreal") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "unreal", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "unreal", "load") diff --git a/pype/unreal/lib.py b/pype/hosts/unreal/lib.py similarity index 99% rename from pype/unreal/lib.py rename to pype/hosts/unreal/lib.py index 0b049c8b1d7..5534c0cbc8d 100644 --- a/pype/unreal/lib.py +++ b/pype/hosts/unreal/lib.py @@ -4,7 +4,7 @@ import json from distutils import dir_util import subprocess -from pypeapp import config +from pype.api import config def get_engine_versions(): diff --git a/pype/unreal/plugin.py b/pype/hosts/unreal/plugin.py similarity index 100% rename from pype/unreal/plugin.py rename to pype/hosts/unreal/plugin.py diff --git a/pype/lib.py b/pype/lib.py index 12d4706af82..d76d02ea5ab 100644 --- a/pype/lib.py +++ b/pype/lib.py @@ -15,7 +15,7 @@ from avalon import io, pipeline import six import avalon.api -from pypeapp import config +from .api import config log = logging.getLogger(__name__) diff --git a/pype/services/__init__.py b/pype/modules/__init__.py similarity index 100% rename from pype/services/__init__.py rename to pype/modules/__init__.py diff --git a/pype/services/adobe_communicator/__init__.py b/pype/modules/adobe_communicator/__init__.py similarity index 100% rename from pype/services/adobe_communicator/__init__.py rename to pype/modules/adobe_communicator/__init__.py diff --git a/pype/services/adobe_communicator/adobe_comunicator.py b/pype/modules/adobe_communicator/adobe_comunicator.py similarity index 98% rename from pype/services/adobe_communicator/adobe_comunicator.py rename to pype/modules/adobe_communicator/adobe_comunicator.py index d842955781f..ef7e05ff57a 100644 --- a/pype/services/adobe_communicator/adobe_comunicator.py +++ b/pype/modules/adobe_communicator/adobe_comunicator.py @@ -1,6 +1,6 @@ import os import pype -from pypeapp import Logger +from pype.api import Logger from .lib import AdobeRestApi, PUBLISH_PATHS log = Logger().get_logger("AdobeCommunicator") diff --git a/pype/services/adobe_communicator/lib/__init__.py b/pype/modules/adobe_communicator/lib/__init__.py similarity index 100% rename from pype/services/adobe_communicator/lib/__init__.py rename to pype/modules/adobe_communicator/lib/__init__.py diff --git a/pype/ftrack/lib/io_nonsingleton.py b/pype/modules/adobe_communicator/lib/io_nonsingleton.py similarity index 100% rename from pype/ftrack/lib/io_nonsingleton.py rename to pype/modules/adobe_communicator/lib/io_nonsingleton.py diff --git a/pype/services/adobe_communicator/lib/publish.py b/pype/modules/adobe_communicator/lib/publish.py similarity index 98% rename from pype/services/adobe_communicator/lib/publish.py rename to pype/modules/adobe_communicator/lib/publish.py index a6fe9910255..6a9faf0403c 100644 --- a/pype/services/adobe_communicator/lib/publish.py +++ b/pype/modules/adobe_communicator/lib/publish.py @@ -6,7 +6,7 @@ import pyblish.util import avalon.api from avalon.tools import publish -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger(__name__) diff --git a/pype/services/adobe_communicator/lib/rest_api.py b/pype/modules/adobe_communicator/lib/rest_api.py similarity index 96% rename from pype/services/adobe_communicator/lib/rest_api.py rename to pype/modules/adobe_communicator/lib/rest_api.py index 2372c4ed200..86739e4d80f 100644 --- a/pype/services/adobe_communicator/lib/rest_api.py +++ b/pype/modules/adobe_communicator/lib/rest_api.py @@ -1,9 +1,9 @@ import os import sys import copy -from pype.services.rest_api import RestApi, route, abort, CallbackResult +from pype.modules.rest_api import RestApi, route, abort, CallbackResult from .io_nonsingleton import DbConnector -from pypeapp import config, execute, Logger +from pype.api import config, execute, Logger log = Logger().get_logger("AdobeCommunicator") diff --git a/pype/avalon_apps/__init__.py b/pype/modules/avalon_apps/__init__.py similarity index 100% rename from pype/avalon_apps/__init__.py rename to pype/modules/avalon_apps/__init__.py diff --git a/pype/avalon_apps/avalon_app.py b/pype/modules/avalon_apps/avalon_app.py similarity index 98% rename from pype/avalon_apps/avalon_app.py rename to pype/modules/avalon_apps/avalon_app.py index d3190a9d53e..d103a84d90d 100644 --- a/pype/avalon_apps/avalon_app.py +++ b/pype/modules/avalon_apps/avalon_app.py @@ -2,7 +2,7 @@ import argparse from Qt import QtGui, QtWidgets from avalon.tools import libraryloader -from pypeapp import Logger +from pype.api import Logger from avalon import io from launcher import launcher_widget, lib as launcher_lib diff --git a/pype/avalon_apps/rest_api.py b/pype/modules/avalon_apps/rest_api.py similarity index 95% rename from pype/avalon_apps/rest_api.py rename to pype/modules/avalon_apps/rest_api.py index a552d709072..a5dc326a8eb 100644 --- a/pype/avalon_apps/rest_api.py +++ b/pype/modules/avalon_apps/rest_api.py @@ -3,8 +3,8 @@ import json import bson import bson.json_util -from pype.services.rest_api import RestApi, abort, CallbackResult -from pype.ftrack.lib.custom_db_connector import DbConnector +from pype.modules.rest_api import RestApi, abort, CallbackResult +from pype.modules.ftrack.lib.custom_db_connector import DbConnector class AvalonRestApi(RestApi): diff --git a/pype/clockify/__init__.py b/pype/modules/clockify/__init__.py similarity index 100% rename from pype/clockify/__init__.py rename to pype/modules/clockify/__init__.py diff --git a/pype/clockify/clockify.py b/pype/modules/clockify/clockify.py similarity index 99% rename from pype/clockify/clockify.py rename to pype/modules/clockify/clockify.py index 5e6cfec7781..6d5dc9213c7 100644 --- a/pype/clockify/clockify.py +++ b/pype/modules/clockify/clockify.py @@ -1,6 +1,7 @@ import os import threading -from pypeapp import style, Logger +from pype.api import Logger +from pypeapp import style from Qt import QtWidgets from . import ClockifySettings, ClockifyAPI, MessageWidget diff --git a/pype/clockify/clockify_api.py b/pype/modules/clockify/clockify_api.py similarity index 100% rename from pype/clockify/clockify_api.py rename to pype/modules/clockify/clockify_api.py diff --git a/pype/clockify/ftrack_actions/action_clockify_sync.py b/pype/modules/clockify/ftrack_actions/action_clockify_sync.py similarity index 97% rename from pype/clockify/ftrack_actions/action_clockify_sync.py rename to pype/modules/clockify/ftrack_actions/action_clockify_sync.py index 59444bc3ac1..a041e6ada62 100644 --- a/pype/clockify/ftrack_actions/action_clockify_sync.py +++ b/pype/modules/clockify/ftrack_actions/action_clockify_sync.py @@ -4,8 +4,8 @@ import logging import json import ftrack_api -from pype.ftrack import BaseAction, MissingPermision -from pype.clockify import ClockifyAPI +from pype.modules.ftrack import BaseAction, MissingPermision +from pype.modules.clockify import ClockifyAPI class SyncClocify(BaseAction): diff --git a/pype/clockify/launcher_actions/ClockifyStart.py b/pype/modules/clockify/launcher_actions/ClockifyStart.py similarity index 96% rename from pype/clockify/launcher_actions/ClockifyStart.py rename to pype/modules/clockify/launcher_actions/ClockifyStart.py index 6a9ceaec734..d5e9164977f 100644 --- a/pype/clockify/launcher_actions/ClockifyStart.py +++ b/pype/modules/clockify/launcher_actions/ClockifyStart.py @@ -1,6 +1,6 @@ from avalon import api, io from pype.api import Logger -from pype.clockify import ClockifyAPI +from pype.modules.clockify import ClockifyAPI log = Logger().get_logger(__name__, "clockify_start") diff --git a/pype/clockify/launcher_actions/ClockifySync.py b/pype/modules/clockify/launcher_actions/ClockifySync.py similarity index 97% rename from pype/clockify/launcher_actions/ClockifySync.py rename to pype/modules/clockify/launcher_actions/ClockifySync.py index 3bf389796fd..0f20d1dce1f 100644 --- a/pype/clockify/launcher_actions/ClockifySync.py +++ b/pype/modules/clockify/launcher_actions/ClockifySync.py @@ -1,5 +1,5 @@ from avalon import api, io -from pype.clockify import ClockifyAPI +from pype.modules.clockify import ClockifyAPI from pype.api import Logger log = Logger().get_logger(__name__, "clockify_sync") diff --git a/pype/clockify/widget_message.py b/pype/modules/clockify/widget_message.py similarity index 100% rename from pype/clockify/widget_message.py rename to pype/modules/clockify/widget_message.py diff --git a/pype/clockify/widget_settings.py b/pype/modules/clockify/widget_settings.py similarity index 100% rename from pype/clockify/widget_settings.py rename to pype/modules/clockify/widget_settings.py diff --git a/pype/ftrack/__init__.py b/pype/modules/ftrack/__init__.py similarity index 100% rename from pype/ftrack/__init__.py rename to pype/modules/ftrack/__init__.py diff --git a/pype/ftrack/actions/action_application_loader.py b/pype/modules/ftrack/actions/action_application_loader.py similarity index 96% rename from pype/ftrack/actions/action_application_loader.py rename to pype/modules/ftrack/actions/action_application_loader.py index 813eee358a3..11aac28615d 100644 --- a/pype/ftrack/actions/action_application_loader.py +++ b/pype/modules/ftrack/actions/action_application_loader.py @@ -1,9 +1,9 @@ import os import toml import time -from pype.ftrack import AppAction +from pype.modules.ftrack import AppAction from avalon import lib -from pypeapp import Logger +from pype.api import Logger from pype.lib import get_all_avalon_projects log = Logger().get_logger(__name__) diff --git a/pype/ftrack/actions/action_attributes_remapper.py b/pype/modules/ftrack/actions/action_attributes_remapper.py similarity index 98% rename from pype/ftrack/actions/action_attributes_remapper.py rename to pype/modules/ftrack/actions/action_attributes_remapper.py index 2059edb8c8c..b5fad7dc450 100644 --- a/pype/ftrack/actions/action_attributes_remapper.py +++ b/pype/modules/ftrack/actions/action_attributes_remapper.py @@ -1,8 +1,8 @@ import os import ftrack_api -from pype.ftrack import BaseAction -from pype.ftrack.lib.io_nonsingleton import DbConnector +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector class AttributesRemapper(BaseAction): diff --git a/pype/ftrack/actions/action_clean_hierarchical_attributes.py b/pype/modules/ftrack/actions/action_clean_hierarchical_attributes.py similarity index 97% rename from pype/ftrack/actions/action_clean_hierarchical_attributes.py rename to pype/modules/ftrack/actions/action_clean_hierarchical_attributes.py index 8b4c2682f6e..03195283193 100644 --- a/pype/ftrack/actions/action_clean_hierarchical_attributes.py +++ b/pype/modules/ftrack/actions/action_clean_hierarchical_attributes.py @@ -1,8 +1,8 @@ import os import collections import ftrack_api -from pype.ftrack import BaseAction -from pype.ftrack.lib.avalon_sync import get_avalon_attr +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.avalon_sync import get_avalon_attr class CleanHierarchicalAttrsAction(BaseAction): diff --git a/pype/ftrack/actions/action_client_review_sort.py b/pype/modules/ftrack/actions/action_client_review_sort.py similarity index 98% rename from pype/ftrack/actions/action_client_review_sort.py rename to pype/modules/ftrack/actions/action_client_review_sort.py index b98cf34756c..1909c317597 100644 --- a/pype/ftrack/actions/action_client_review_sort.py +++ b/pype/modules/ftrack/actions/action_client_review_sort.py @@ -1,4 +1,4 @@ -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction try: from functools import cmp_to_key except Exception: diff --git a/pype/ftrack/actions/action_component_open.py b/pype/modules/ftrack/actions/action_component_open.py similarity index 98% rename from pype/ftrack/actions/action_component_open.py rename to pype/modules/ftrack/actions/action_component_open.py index d721731ab07..aebd543769c 100644 --- a/pype/ftrack/actions/action_component_open.py +++ b/pype/modules/ftrack/actions/action_component_open.py @@ -4,7 +4,7 @@ import logging import subprocess import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class ComponentOpen(BaseAction): diff --git a/pype/ftrack/actions/action_create_cust_attrs.py b/pype/modules/ftrack/actions/action_create_cust_attrs.py similarity index 99% rename from pype/ftrack/actions/action_create_cust_attrs.py rename to pype/modules/ftrack/actions/action_create_cust_attrs.py index 37b11256d2f..6e9827a231a 100644 --- a/pype/ftrack/actions/action_create_cust_attrs.py +++ b/pype/modules/ftrack/actions/action_create_cust_attrs.py @@ -3,9 +3,9 @@ import json import arrow import ftrack_api -from pype.ftrack import BaseAction -from pype.ftrack.lib.avalon_sync import CustAttrIdKey -from pypeapp import config +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.avalon_sync import CustAttrIdKey +from pype.api import config """ This action creates/updates custom attributes. diff --git a/pype/ftrack/actions/action_create_folders.py b/pype/modules/ftrack/actions/action_create_folders.py similarity index 99% rename from pype/ftrack/actions/action_create_folders.py rename to pype/modules/ftrack/actions/action_create_folders.py index 8f3358cf9c0..9146c54fad0 100644 --- a/pype/ftrack/actions/action_create_folders.py +++ b/pype/modules/ftrack/actions/action_create_folders.py @@ -1,7 +1,7 @@ import os -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction from avalon import lib as avalonlib -from pypeapp import config, Anatomy +from pype.api import config, Anatomy class CreateFolders(BaseAction): diff --git a/pype/ftrack/actions/action_create_project_structure.py b/pype/modules/ftrack/actions/action_create_project_structure.py similarity index 99% rename from pype/ftrack/actions/action_create_project_structure.py rename to pype/modules/ftrack/actions/action_create_project_structure.py index e1c5b6b8372..526cf172bf4 100644 --- a/pype/ftrack/actions/action_create_project_structure.py +++ b/pype/modules/ftrack/actions/action_create_project_structure.py @@ -1,8 +1,8 @@ import os import re -from pype.ftrack import BaseAction -from pypeapp import config, Anatomy +from pype.modules.ftrack import BaseAction +from pype.api import config, Anatomy class CreateProjectFolders(BaseAction): diff --git a/pype/ftrack/actions/action_cust_attr_doctor.py b/pype/modules/ftrack/actions/action_cust_attr_doctor.py similarity index 99% rename from pype/ftrack/actions/action_cust_attr_doctor.py rename to pype/modules/ftrack/actions/action_cust_attr_doctor.py index a14db4687a5..e67ce4e5bfb 100644 --- a/pype/ftrack/actions/action_cust_attr_doctor.py +++ b/pype/modules/ftrack/actions/action_cust_attr_doctor.py @@ -5,7 +5,7 @@ import logging import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class CustomAttributeDoctor(BaseAction): diff --git a/pype/ftrack/actions/action_delete_asset.py b/pype/modules/ftrack/actions/action_delete_asset.py similarity index 99% rename from pype/ftrack/actions/action_delete_asset.py rename to pype/modules/ftrack/actions/action_delete_asset.py index 6a3b7243792..d4f6eb65943 100644 --- a/pype/ftrack/actions/action_delete_asset.py +++ b/pype/modules/ftrack/actions/action_delete_asset.py @@ -5,8 +5,8 @@ from queue import Queue from bson.objectid import ObjectId -from pype.ftrack import BaseAction -from pype.ftrack.lib.io_nonsingleton import DbConnector +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector class DeleteAssetSubset(BaseAction): diff --git a/pype/ftrack/actions/action_delete_old_versions.py b/pype/modules/ftrack/actions/action_delete_old_versions.py similarity index 99% rename from pype/ftrack/actions/action_delete_old_versions.py rename to pype/modules/ftrack/actions/action_delete_old_versions.py index 30f786e93f3..00432d5c3f3 100644 --- a/pype/ftrack/actions/action_delete_old_versions.py +++ b/pype/modules/ftrack/actions/action_delete_old_versions.py @@ -5,9 +5,9 @@ import clique from pymongo import UpdateOne -from pype.ftrack import BaseAction -from pype.ftrack.lib.io_nonsingleton import DbConnector -from pypeapp import Anatomy +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector +from pype.api import Anatomy import avalon.pipeline diff --git a/pype/ftrack/actions/action_delivery.py b/pype/modules/ftrack/actions/action_delivery.py similarity index 99% rename from pype/ftrack/actions/action_delivery.py rename to pype/modules/ftrack/actions/action_delivery.py index 23da81d3831..1dfd3dd5d55 100644 --- a/pype/ftrack/actions/action_delivery.py +++ b/pype/modules/ftrack/actions/action_delivery.py @@ -10,9 +10,9 @@ from avalon.vendor import filelink from avalon.tools.libraryloader.io_nonsingleton import DbConnector -from pypeapp import Anatomy -from pype.ftrack import BaseAction -from pype.ftrack.lib.avalon_sync import CustAttrIdKey +from pype.api import Anatomy +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.avalon_sync import CustAttrIdKey class Delivery(BaseAction): diff --git a/pype/ftrack/actions/action_djvview.py b/pype/modules/ftrack/actions/action_djvview.py similarity index 99% rename from pype/ftrack/actions/action_djvview.py rename to pype/modules/ftrack/actions/action_djvview.py index ad00e33360f..32c5824e0f0 100644 --- a/pype/ftrack/actions/action_djvview.py +++ b/pype/modules/ftrack/actions/action_djvview.py @@ -5,8 +5,8 @@ import subprocess from operator import itemgetter import ftrack_api -from pype.ftrack import BaseAction -from pypeapp import Logger, config +from pype.modules.ftrack import BaseAction +from pype.api import Logger, config log = Logger().get_logger(__name__) diff --git a/pype/ftrack/actions/action_job_killer.py b/pype/modules/ftrack/actions/action_job_killer.py similarity index 99% rename from pype/ftrack/actions/action_job_killer.py rename to pype/modules/ftrack/actions/action_job_killer.py index f01cebd0a81..064d7ed209d 100644 --- a/pype/ftrack/actions/action_job_killer.py +++ b/pype/modules/ftrack/actions/action_job_killer.py @@ -5,7 +5,7 @@ import json import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class JobKiller(BaseAction): diff --git a/pype/ftrack/actions/action_multiple_notes.py b/pype/modules/ftrack/actions/action_multiple_notes.py similarity index 99% rename from pype/ftrack/actions/action_multiple_notes.py rename to pype/modules/ftrack/actions/action_multiple_notes.py index 20637c001de..dcdb4c5dc9f 100644 --- a/pype/ftrack/actions/action_multiple_notes.py +++ b/pype/modules/ftrack/actions/action_multiple_notes.py @@ -4,7 +4,7 @@ import logging import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class MultipleNotes(BaseAction): diff --git a/pype/ftrack/actions/action_prepare_project.py b/pype/modules/ftrack/actions/action_prepare_project.py similarity index 98% rename from pype/ftrack/actions/action_prepare_project.py rename to pype/modules/ftrack/actions/action_prepare_project.py index 2693a5750b8..31cc8021096 100644 --- a/pype/ftrack/actions/action_prepare_project.py +++ b/pype/modules/ftrack/actions/action_prepare_project.py @@ -1,9 +1,9 @@ import os import json -from pype.ftrack import BaseAction -from pypeapp import config, Anatomy, project_overrides_dir_path -from pype.ftrack.lib.avalon_sync import get_avalon_attr +from pype.modules.ftrack import BaseAction +from pype.api import config, Anatomy, project_overrides_dir_path +from pype.modules.ftrack.lib.avalon_sync import get_avalon_attr class PrepareProject(BaseAction): diff --git a/pype/ftrack/actions/action_rv.py b/pype/modules/ftrack/actions/action_rv.py similarity index 99% rename from pype/ftrack/actions/action_rv.py rename to pype/modules/ftrack/actions/action_rv.py index 0e2cd599814..ce2371b5b85 100644 --- a/pype/ftrack/actions/action_rv.py +++ b/pype/modules/ftrack/actions/action_rv.py @@ -5,8 +5,8 @@ import traceback import json -from pypeapp import Logger, config -from pype.ftrack import BaseAction +from pype.api import Logger, config +from pype.modules.ftrack import BaseAction import ftrack_api from avalon import io, api diff --git a/pype/ftrack/actions/action_seed.py b/pype/modules/ftrack/actions/action_seed.py similarity index 99% rename from pype/ftrack/actions/action_seed.py rename to pype/modules/ftrack/actions/action_seed.py index 537aeab65b3..72625c13e47 100644 --- a/pype/ftrack/actions/action_seed.py +++ b/pype/modules/ftrack/actions/action_seed.py @@ -1,6 +1,6 @@ import os from operator import itemgetter -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class SeedDebugProject(BaseAction): diff --git a/pype/ftrack/actions/action_start_timer.py b/pype/modules/ftrack/actions/action_start_timer.py similarity index 95% rename from pype/ftrack/actions/action_start_timer.py rename to pype/modules/ftrack/actions/action_start_timer.py index bd77276b6de..3e5cf0d4c10 100644 --- a/pype/ftrack/actions/action_start_timer.py +++ b/pype/modules/ftrack/actions/action_start_timer.py @@ -1,5 +1,5 @@ import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class StartTimer(BaseAction): diff --git a/pype/ftrack/actions/action_store_thumbnails_to_avalon.py b/pype/modules/ftrack/actions/action_store_thumbnails_to_avalon.py similarity index 98% rename from pype/ftrack/actions/action_store_thumbnails_to_avalon.py rename to pype/modules/ftrack/actions/action_store_thumbnails_to_avalon.py index c95010c5ce4..180d6ae03cb 100644 --- a/pype/ftrack/actions/action_store_thumbnails_to_avalon.py +++ b/pype/modules/ftrack/actions/action_store_thumbnails_to_avalon.py @@ -4,11 +4,11 @@ import json from bson.objectid import ObjectId -from pype.ftrack import BaseAction -from pypeapp import Anatomy -from pype.ftrack.lib.io_nonsingleton import DbConnector +from pype.modules.ftrack import BaseAction +from pype.api import Anatomy +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector -from pype.ftrack.lib.avalon_sync import CustAttrIdKey +from pype.modules.ftrack.lib.avalon_sync import CustAttrIdKey class StoreThumbnailsToAvalon(BaseAction): diff --git a/pype/ftrack/actions/action_sync_to_avalon.py b/pype/modules/ftrack/actions/action_sync_to_avalon.py similarity index 98% rename from pype/ftrack/actions/action_sync_to_avalon.py rename to pype/modules/ftrack/actions/action_sync_to_avalon.py index d2fcfb372f7..8c6519e4dc5 100644 --- a/pype/ftrack/actions/action_sync_to_avalon.py +++ b/pype/modules/ftrack/actions/action_sync_to_avalon.py @@ -2,8 +2,8 @@ import time import traceback -from pype.ftrack import BaseAction -from pype.ftrack.lib.avalon_sync import SyncEntitiesFactory +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.avalon_sync import SyncEntitiesFactory class SyncToAvalonLocal(BaseAction): diff --git a/pype/ftrack/actions/action_test.py b/pype/modules/ftrack/actions/action_test.py similarity index 97% rename from pype/ftrack/actions/action_test.py rename to pype/modules/ftrack/actions/action_test.py index 502373e626a..784bf809449 100644 --- a/pype/ftrack/actions/action_test.py +++ b/pype/modules/ftrack/actions/action_test.py @@ -7,8 +7,8 @@ import re import ftrack_api -from pype.ftrack import BaseAction from avalon import io, inventory, schema +from pype.modules.ftrack import BaseAction class TestAction(BaseAction): diff --git a/pype/ftrack/actions/action_thumbnail_to_childern.py b/pype/modules/ftrack/actions/action_thumbnail_to_childern.py similarity index 98% rename from pype/ftrack/actions/action_thumbnail_to_childern.py rename to pype/modules/ftrack/actions/action_thumbnail_to_childern.py index 7d8c02d6c73..e194134694b 100644 --- a/pype/ftrack/actions/action_thumbnail_to_childern.py +++ b/pype/modules/ftrack/actions/action_thumbnail_to_childern.py @@ -5,7 +5,7 @@ import json import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class ThumbToChildren(BaseAction): diff --git a/pype/ftrack/actions/action_thumbnail_to_parent.py b/pype/modules/ftrack/actions/action_thumbnail_to_parent.py similarity index 98% rename from pype/ftrack/actions/action_thumbnail_to_parent.py rename to pype/modules/ftrack/actions/action_thumbnail_to_parent.py index afc214a37e1..86ada64e5a5 100644 --- a/pype/ftrack/actions/action_thumbnail_to_parent.py +++ b/pype/modules/ftrack/actions/action_thumbnail_to_parent.py @@ -4,7 +4,7 @@ import logging import json import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class ThumbToParent(BaseAction): diff --git a/pype/ftrack/actions/action_update_from_v2-2-0.py b/pype/modules/ftrack/actions/action_update_from_v2-2-0.py similarity index 98% rename from pype/ftrack/actions/action_update_from_v2-2-0.py rename to pype/modules/ftrack/actions/action_update_from_v2-2-0.py index dd0f1e6ea2a..805072ce5d1 100644 --- a/pype/ftrack/actions/action_update_from_v2-2-0.py +++ b/pype/modules/ftrack/actions/action_update_from_v2-2-0.py @@ -1,7 +1,7 @@ import os -from pype.ftrack import BaseAction -from pype.ftrack.lib.io_nonsingleton import DbConnector +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector class PypeUpdateFromV2_2_0(BaseAction): diff --git a/pype/ftrack/actions/action_where_run_ask.py b/pype/modules/ftrack/actions/action_where_run_ask.py similarity index 96% rename from pype/ftrack/actions/action_where_run_ask.py rename to pype/modules/ftrack/actions/action_where_run_ask.py index a28f32f407d..d7bc8b11f92 100644 --- a/pype/ftrack/actions/action_where_run_ask.py +++ b/pype/modules/ftrack/actions/action_where_run_ask.py @@ -1,5 +1,5 @@ import os -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class ActionAskWhereIRun(BaseAction): diff --git a/pype/ftrack/actions/action_where_run_show.py b/pype/modules/ftrack/actions/action_where_run_show.py similarity index 98% rename from pype/ftrack/actions/action_where_run_show.py rename to pype/modules/ftrack/actions/action_where_run_show.py index 3f37ef83789..c7abccb8c9c 100644 --- a/pype/ftrack/actions/action_where_run_show.py +++ b/pype/modules/ftrack/actions/action_where_run_show.py @@ -2,7 +2,7 @@ import socket import getpass import ftrack_api -from pype.ftrack import BaseAction +from pype.modules.ftrack import BaseAction class ActionShowWhereIRun(BaseAction): diff --git a/pype/ftrack/events/action_sync_to_avalon.py b/pype/modules/ftrack/events/action_sync_to_avalon.py similarity index 98% rename from pype/ftrack/events/action_sync_to_avalon.py rename to pype/modules/ftrack/events/action_sync_to_avalon.py index 79ab1b5f7af..a06b825d6a2 100644 --- a/pype/ftrack/events/action_sync_to_avalon.py +++ b/pype/modules/ftrack/events/action_sync_to_avalon.py @@ -2,9 +2,9 @@ import time import traceback -from pype.ftrack import BaseAction -from pype.ftrack.lib.avalon_sync import SyncEntitiesFactory -from pypeapp import config +from pype.modules.ftrack import BaseAction +from pype.modules.ftrack.lib.avalon_sync import SyncEntitiesFactory +from pype.api import config class SyncToAvalonServer(BaseAction): diff --git a/pype/ftrack/events/event_del_avalon_id_from_new.py b/pype/modules/ftrack/events/event_del_avalon_id_from_new.py similarity index 90% rename from pype/ftrack/events/event_del_avalon_id_from_new.py rename to pype/modules/ftrack/events/event_del_avalon_id_from_new.py index d820e404678..89bad52f291 100644 --- a/pype/ftrack/events/event_del_avalon_id_from_new.py +++ b/pype/modules/ftrack/events/event_del_avalon_id_from_new.py @@ -1,6 +1,6 @@ -from pype.ftrack.lib import BaseEvent -from pype.ftrack.lib.avalon_sync import CustAttrIdKey -from pype.ftrack.events.event_sync_to_avalon import SyncToAvalonEvent +from pype.modules.ftrack.lib import BaseEvent +from pype.modules.ftrack.lib.avalon_sync import CustAttrIdKey +from pype.modules.ftrack.events.event_sync_to_avalon import SyncToAvalonEvent class DelAvalonIdFromNew(BaseEvent): diff --git a/pype/ftrack/events/event_first_version_status.py b/pype/modules/ftrack/events/event_first_version_status.py similarity index 99% rename from pype/ftrack/events/event_first_version_status.py rename to pype/modules/ftrack/events/event_first_version_status.py index 2e2b98ad5f1..511907a0485 100644 --- a/pype/ftrack/events/event_first_version_status.py +++ b/pype/modules/ftrack/events/event_first_version_status.py @@ -1,4 +1,4 @@ -from pype.ftrack import BaseEvent +from pype.modules.ftrack import BaseEvent class FirstVersionStatus(BaseEvent): diff --git a/pype/ftrack/events/event_next_task_update.py b/pype/modules/ftrack/events/event_next_task_update.py similarity index 98% rename from pype/ftrack/events/event_next_task_update.py rename to pype/modules/ftrack/events/event_next_task_update.py index c709fed5e55..dc1ab0a0d71 100644 --- a/pype/ftrack/events/event_next_task_update.py +++ b/pype/modules/ftrack/events/event_next_task_update.py @@ -1,5 +1,5 @@ import ftrack_api -from pype.ftrack import BaseEvent +from pype.modules.ftrack import BaseEvent import operator diff --git a/pype/ftrack/events/event_radio_buttons.py b/pype/modules/ftrack/events/event_radio_buttons.py similarity index 96% rename from pype/ftrack/events/event_radio_buttons.py rename to pype/modules/ftrack/events/event_radio_buttons.py index 5b633d89763..b2ab4e75ec4 100644 --- a/pype/ftrack/events/event_radio_buttons.py +++ b/pype/modules/ftrack/events/event_radio_buttons.py @@ -1,5 +1,5 @@ import ftrack_api -from pype.ftrack.lib import BaseEvent +from pype.modules.ftrack.lib import BaseEvent class RadioButtons(BaseEvent): diff --git a/pype/ftrack/events/event_sync_to_avalon.py b/pype/modules/ftrack/events/event_sync_to_avalon.py similarity index 99% rename from pype/ftrack/events/event_sync_to_avalon.py rename to pype/modules/ftrack/events/event_sync_to_avalon.py index 19bd6c82735..e79fcac4cd7 100644 --- a/pype/ftrack/events/event_sync_to_avalon.py +++ b/pype/modules/ftrack/events/event_sync_to_avalon.py @@ -12,14 +12,14 @@ from avalon import schema -from pype.ftrack.lib import avalon_sync -from pype.ftrack.lib.avalon_sync import ( +from pype.modules.ftrack.lib import avalon_sync +from pype.modules.ftrack.lib.avalon_sync import ( CustAttrIdKey, CustAttrAutoSync, EntitySchemas ) import ftrack_api -from pype.ftrack import BaseEvent +from pype.modules.ftrack import BaseEvent -from pype.ftrack.lib.io_nonsingleton import DbConnector +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector class SyncToAvalonEvent(BaseEvent): diff --git a/pype/ftrack/events/event_test.py b/pype/modules/ftrack/events/event_test.py similarity index 90% rename from pype/ftrack/events/event_test.py rename to pype/modules/ftrack/events/event_test.py index 1dfd8ee8b10..0a86bd1754a 100644 --- a/pype/ftrack/events/event_test.py +++ b/pype/modules/ftrack/events/event_test.py @@ -2,7 +2,7 @@ import sys import re import ftrack_api -from pype.ftrack import BaseEvent +from pype.modules.ftrack import BaseEvent class TestEvent(BaseEvent): diff --git a/pype/ftrack/events/event_thumbnail_updates.py b/pype/modules/ftrack/events/event_thumbnail_updates.py similarity index 97% rename from pype/ftrack/events/event_thumbnail_updates.py rename to pype/modules/ftrack/events/event_thumbnail_updates.py index c62be9718a4..c33ee08c2dd 100644 --- a/pype/ftrack/events/event_thumbnail_updates.py +++ b/pype/modules/ftrack/events/event_thumbnail_updates.py @@ -1,4 +1,4 @@ -from pype.ftrack import BaseEvent +from pype.modules.ftrack import BaseEvent class ThumbnailEvents(BaseEvent): diff --git a/pype/ftrack/events/event_user_assigment.py b/pype/modules/ftrack/events/event_user_assigment.py similarity index 96% rename from pype/ftrack/events/event_user_assigment.py rename to pype/modules/ftrack/events/event_user_assigment.py index bf3bec93be3..e198ced6188 100644 --- a/pype/ftrack/events/event_user_assigment.py +++ b/pype/modules/ftrack/events/event_user_assigment.py @@ -2,14 +2,13 @@ import re import subprocess -from pype.ftrack import BaseEvent -from pype.ftrack.lib.avalon_sync import CustAttrIdKey -from pype.ftrack.lib.io_nonsingleton import DbConnector +from pype.modules.ftrack import BaseEvent +from pype.modules.ftrack.lib.avalon_sync import CustAttrIdKey +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector from bson.objectid import ObjectId -from pypeapp import config -from pypeapp import Anatomy +from pype.api import config, Anatomy class UserAssigmentEvent(BaseEvent): @@ -149,7 +148,7 @@ def _get_template_data(self, task): """ Get data to fill template from task - .. seealso:: :mod:`pypeapp.Anatomy` + .. seealso:: :mod:`pype.api.Anatomy` :param task: Task entity :type task: dict diff --git a/pype/ftrack/events/event_version_to_task_statuses.py b/pype/modules/ftrack/events/event_version_to_task_statuses.py similarity index 98% rename from pype/ftrack/events/event_version_to_task_statuses.py rename to pype/modules/ftrack/events/event_version_to_task_statuses.py index 0d2a3130c04..3ff986f9c60 100644 --- a/pype/ftrack/events/event_version_to_task_statuses.py +++ b/pype/modules/ftrack/events/event_version_to_task_statuses.py @@ -1,5 +1,5 @@ -from pype.ftrack import BaseEvent -from pypeapp import config +from pype.modules.ftrack import BaseEvent +from pype.api import config class VersionToTaskStatus(BaseEvent): diff --git a/pype/ftrack/ftrack_server/__init__.py b/pype/modules/ftrack/ftrack_server/__init__.py similarity index 100% rename from pype/ftrack/ftrack_server/__init__.py rename to pype/modules/ftrack/ftrack_server/__init__.py diff --git a/pype/ftrack/ftrack_server/event_server_cli.py b/pype/modules/ftrack/ftrack_server/event_server_cli.py similarity index 99% rename from pype/ftrack/ftrack_server/event_server_cli.py rename to pype/modules/ftrack/ftrack_server/event_server_cli.py index 4c1d1667c36..5709a882972 100644 --- a/pype/ftrack/ftrack_server/event_server_cli.py +++ b/pype/modules/ftrack/ftrack_server/event_server_cli.py @@ -13,8 +13,8 @@ import uuid import ftrack_api -from pype.ftrack.lib import credentials -from pype.ftrack.ftrack_server.lib import ( +from pype.modules.ftrack.lib import credentials +from pype.modules.ftrack.ftrack_server.lib import ( ftrack_events_mongo_settings, check_ftrack_url ) import socket_thread diff --git a/pype/ftrack/ftrack_server/ftrack_server.py b/pype/modules/ftrack/ftrack_server/ftrack_server.py similarity index 99% rename from pype/ftrack/ftrack_server/ftrack_server.py rename to pype/modules/ftrack/ftrack_server/ftrack_server.py index 8464203c1d4..92f3c0b3a0c 100644 --- a/pype/ftrack/ftrack_server/ftrack_server.py +++ b/pype/modules/ftrack/ftrack_server/ftrack_server.py @@ -6,7 +6,7 @@ import time import logging import inspect -from pypeapp import Logger, config +from pype.api import Logger, config log = Logger().get_logger(__name__) diff --git a/pype/ftrack/ftrack_server/lib.py b/pype/modules/ftrack/ftrack_server/lib.py similarity index 99% rename from pype/ftrack/ftrack_server/lib.py rename to pype/modules/ftrack/ftrack_server/lib.py index e623cab8fbb..129cd7173af 100644 --- a/pype/ftrack/ftrack_server/lib.py +++ b/pype/modules/ftrack/ftrack_server/lib.py @@ -23,9 +23,9 @@ except ImportError: from urlparse import urlparse, parse_qs -from pypeapp import Logger +from pype.api import Logger -from pype.ftrack.lib.custom_db_connector import DbConnector +from pype.modules.ftrack.lib.custom_db_connector import DbConnector TOPIC_STATUS_SERVER = "pype.event.server.status" diff --git a/pype/ftrack/ftrack_server/socket_thread.py b/pype/modules/ftrack/ftrack_server/socket_thread.py similarity index 99% rename from pype/ftrack/ftrack_server/socket_thread.py rename to pype/modules/ftrack/ftrack_server/socket_thread.py index 942965f9e2e..dda4c7db356 100644 --- a/pype/ftrack/ftrack_server/socket_thread.py +++ b/pype/modules/ftrack/ftrack_server/socket_thread.py @@ -5,7 +5,7 @@ import threading import traceback import subprocess -from pypeapp import Logger +from pype.api import Logger class SocketThread(threading.Thread): diff --git a/pype/ftrack/ftrack_server/sub_event_processor.py b/pype/modules/ftrack/ftrack_server/sub_event_processor.py similarity index 96% rename from pype/ftrack/ftrack_server/sub_event_processor.py rename to pype/modules/ftrack/ftrack_server/sub_event_processor.py index 2a3ad3e76d5..d7bb7a53b37 100644 --- a/pype/ftrack/ftrack_server/sub_event_processor.py +++ b/pype/modules/ftrack/ftrack_server/sub_event_processor.py @@ -5,11 +5,11 @@ import datetime from ftrack_server import FtrackServer -from pype.ftrack.ftrack_server.lib import ( +from pype.modules.ftrack.ftrack_server.lib import ( SocketSession, ProcessEventHub, TOPIC_STATUS_SERVER ) import ftrack_api -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger("Event processor") diff --git a/pype/ftrack/ftrack_server/sub_event_status.py b/pype/modules/ftrack/ftrack_server/sub_event_status.py similarity index 99% rename from pype/ftrack/ftrack_server/sub_event_status.py rename to pype/modules/ftrack/ftrack_server/sub_event_status.py index d3e6a3d6475..c2e7b7477fd 100644 --- a/pype/ftrack/ftrack_server/sub_event_status.py +++ b/pype/modules/ftrack/ftrack_server/sub_event_status.py @@ -8,11 +8,11 @@ import ftrack_api from ftrack_server import FtrackServer -from pype.ftrack.ftrack_server.lib import ( +from pype.modules.ftrack.ftrack_server.lib import ( SocketSession, StatusEventHub, TOPIC_STATUS_SERVER, TOPIC_STATUS_SERVER_RESULT ) -from pypeapp import Logger, config +from pype.api import Logger, config log = Logger().get_logger("Event storer") action_identifier = ( diff --git a/pype/ftrack/ftrack_server/sub_event_storer.py b/pype/modules/ftrack/ftrack_server/sub_event_storer.py similarity index 97% rename from pype/ftrack/ftrack_server/sub_event_storer.py rename to pype/modules/ftrack/ftrack_server/sub_event_storer.py index b4b9b8a7aba..c4d199407dd 100644 --- a/pype/ftrack/ftrack_server/sub_event_storer.py +++ b/pype/modules/ftrack/ftrack_server/sub_event_storer.py @@ -7,13 +7,13 @@ import ftrack_api from ftrack_server import FtrackServer -from pype.ftrack.ftrack_server.lib import ( +from pype.modules.ftrack.ftrack_server.lib import ( SocketSession, StorerEventHub, get_ftrack_event_mongo_info, TOPIC_STATUS_SERVER, TOPIC_STATUS_SERVER_RESULT ) -from pype.ftrack.lib.custom_db_connector import DbConnector -from pypeapp import Logger +from pype.modules.ftrack.lib.custom_db_connector import DbConnector +from pype.api import Logger log = Logger().get_logger("Event storer") subprocess_started = datetime.datetime.now() diff --git a/pype/ftrack/ftrack_server/sub_legacy_server.py b/pype/modules/ftrack/ftrack_server/sub_legacy_server.py similarity index 98% rename from pype/ftrack/ftrack_server/sub_legacy_server.py rename to pype/modules/ftrack/ftrack_server/sub_legacy_server.py index 8b7bab5e2e8..c37727a784a 100644 --- a/pype/ftrack/ftrack_server/sub_legacy_server.py +++ b/pype/modules/ftrack/ftrack_server/sub_legacy_server.py @@ -6,7 +6,7 @@ from ftrack_server import FtrackServer import ftrack_api -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger("Event Server Legacy") diff --git a/pype/ftrack/ftrack_server/sub_user_server.py b/pype/modules/ftrack/ftrack_server/sub_user_server.py similarity index 91% rename from pype/ftrack/ftrack_server/sub_user_server.py rename to pype/modules/ftrack/ftrack_server/sub_user_server.py index 8c1497a5629..f4b81922ebd 100644 --- a/pype/ftrack/ftrack_server/sub_user_server.py +++ b/pype/modules/ftrack/ftrack_server/sub_user_server.py @@ -5,9 +5,12 @@ import traceback from ftrack_server import FtrackServer -from pype.ftrack.ftrack_server.lib import SocketSession, SocketBaseEventHub +from pype.modules.ftrack.ftrack_server.lib import ( + SocketSession, + SocketBaseEventHub +) -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger("FtrackUserServer") diff --git a/pype/ftrack/lib/__init__.py b/pype/modules/ftrack/lib/__init__.py similarity index 100% rename from pype/ftrack/lib/__init__.py rename to pype/modules/ftrack/lib/__init__.py diff --git a/pype/ftrack/lib/avalon_sync.py b/pype/modules/ftrack/lib/avalon_sync.py similarity index 99% rename from pype/ftrack/lib/avalon_sync.py rename to pype/modules/ftrack/lib/avalon_sync.py index 6bf0cd97546..c5c9eb90543 100644 --- a/pype/ftrack/lib/avalon_sync.py +++ b/pype/modules/ftrack/lib/avalon_sync.py @@ -4,12 +4,12 @@ import collections import copy -from pype.ftrack.lib.io_nonsingleton import DbConnector +from pype.modules.ftrack.lib.io_nonsingleton import DbConnector import avalon import avalon.api from avalon.vendor import toml -from pypeapp import Logger, Anatomy +from pype.api import Logger, Anatomy from bson.objectid import ObjectId from bson.errors import InvalidId diff --git a/pype/ftrack/lib/credentials.py b/pype/modules/ftrack/lib/credentials.py similarity index 100% rename from pype/ftrack/lib/credentials.py rename to pype/modules/ftrack/lib/credentials.py diff --git a/pype/ftrack/lib/custom_db_connector.py b/pype/modules/ftrack/lib/custom_db_connector.py similarity index 100% rename from pype/ftrack/lib/custom_db_connector.py rename to pype/modules/ftrack/lib/custom_db_connector.py diff --git a/pype/ftrack/lib/ftrack_action_handler.py b/pype/modules/ftrack/lib/ftrack_action_handler.py similarity index 100% rename from pype/ftrack/lib/ftrack_action_handler.py rename to pype/modules/ftrack/lib/ftrack_action_handler.py diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/modules/ftrack/lib/ftrack_app_handler.py similarity index 99% rename from pype/ftrack/lib/ftrack_app_handler.py rename to pype/modules/ftrack/lib/ftrack_app_handler.py index f91695edf0b..00bd13fd735 100644 --- a/pype/ftrack/lib/ftrack_app_handler.py +++ b/pype/modules/ftrack/lib/ftrack_app_handler.py @@ -5,11 +5,9 @@ import avalon.lib import acre from pype import lib as pypelib -from pypeapp import config +from pype.api import config, Anatomy from .ftrack_action_handler import BaseAction -from pypeapp import Anatomy - class AppAction(BaseAction): """Application Action class. diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/modules/ftrack/lib/ftrack_base_handler.py similarity index 99% rename from pype/ftrack/lib/ftrack_base_handler.py rename to pype/modules/ftrack/lib/ftrack_base_handler.py index 09d4cfe621b..c7144bb2f7b 100644 --- a/pype/ftrack/lib/ftrack_base_handler.py +++ b/pype/modules/ftrack/lib/ftrack_base_handler.py @@ -1,8 +1,8 @@ import functools import time -from pypeapp import Logger +from pype.api import Logger import ftrack_api -from pype.ftrack.ftrack_server.lib import SocketSession +from pype.modules.ftrack.ftrack_server.lib import SocketSession class MissingPermision(Exception): diff --git a/pype/ftrack/lib/ftrack_event_handler.py b/pype/modules/ftrack/lib/ftrack_event_handler.py similarity index 100% rename from pype/ftrack/lib/ftrack_event_handler.py rename to pype/modules/ftrack/lib/ftrack_event_handler.py diff --git a/pype/services/adobe_communicator/lib/io_nonsingleton.py b/pype/modules/ftrack/lib/io_nonsingleton.py similarity index 100% rename from pype/services/adobe_communicator/lib/io_nonsingleton.py rename to pype/modules/ftrack/lib/io_nonsingleton.py diff --git a/pype/ftrack/tray/__init__.py b/pype/modules/ftrack/tray/__init__.py similarity index 100% rename from pype/ftrack/tray/__init__.py rename to pype/modules/ftrack/tray/__init__.py diff --git a/pype/ftrack/tray/ftrack_module.py b/pype/modules/ftrack/tray/ftrack_module.py similarity index 99% rename from pype/ftrack/tray/ftrack_module.py rename to pype/modules/ftrack/tray/ftrack_module.py index 5811209a028..674e8cbd4f6 100644 --- a/pype/ftrack/tray/ftrack_module.py +++ b/pype/modules/ftrack/tray/ftrack_module.py @@ -10,7 +10,7 @@ from ..lib import credentials from . import login_dialog -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger("FtrackModule", "ftrack") diff --git a/pype/ftrack/tray/login_dialog.py b/pype/modules/ftrack/tray/login_dialog.py similarity index 99% rename from pype/ftrack/tray/login_dialog.py rename to pype/modules/ftrack/tray/login_dialog.py index 88c4e90374d..0bfa1cc4814 100644 --- a/pype/ftrack/tray/login_dialog.py +++ b/pype/modules/ftrack/tray/login_dialog.py @@ -1,7 +1,7 @@ import os import requests from pypeapp import style -from pype.ftrack import credentials +from pype.modules.ftrack import credentials from . import login_tools from Qt import QtCore, QtGui, QtWidgets diff --git a/pype/ftrack/tray/login_tools.py b/pype/modules/ftrack/tray/login_tools.py similarity index 100% rename from pype/ftrack/tray/login_tools.py rename to pype/modules/ftrack/tray/login_tools.py diff --git a/pype/services/idle_manager/__init__.py b/pype/modules/idle_manager/__init__.py similarity index 100% rename from pype/services/idle_manager/__init__.py rename to pype/modules/idle_manager/__init__.py diff --git a/pype/services/idle_manager/idle_manager.py b/pype/modules/idle_manager/idle_manager.py similarity index 99% rename from pype/services/idle_manager/idle_manager.py rename to pype/modules/idle_manager/idle_manager.py index 0897245049b..cfcdfef78f8 100644 --- a/pype/services/idle_manager/idle_manager.py +++ b/pype/modules/idle_manager/idle_manager.py @@ -2,7 +2,7 @@ import collections from Qt import QtCore from pynput import mouse, keyboard -from pypeapp import Logger +from pype.api import Logger class IdleManager(QtCore.QThread): diff --git a/pype/modules/logging/gui/__init__.py b/pype/modules/logging/gui/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pype/logging/gui/app.py b/pype/modules/logging/gui/app.py similarity index 100% rename from pype/logging/gui/app.py rename to pype/modules/logging/gui/app.py diff --git a/pype/logging/gui/lib.py b/pype/modules/logging/gui/lib.py similarity index 100% rename from pype/logging/gui/lib.py rename to pype/modules/logging/gui/lib.py diff --git a/pype/logging/gui/models.py b/pype/modules/logging/gui/models.py similarity index 99% rename from pype/logging/gui/models.py rename to pype/modules/logging/gui/models.py index 6722ed0fe0d..2ef79554fe5 100644 --- a/pype/logging/gui/models.py +++ b/pype/modules/logging/gui/models.py @@ -1,6 +1,6 @@ import os from Qt import QtCore -from pypeapp import Logger +from pype.api import Logger from pypeapp.lib.log import _bootstrap_mongo_log log = Logger().get_logger("LogModel", "LoggingModule") diff --git a/pype/logging/gui/widgets.py b/pype/modules/logging/gui/widgets.py similarity index 100% rename from pype/logging/gui/widgets.py rename to pype/modules/logging/gui/widgets.py diff --git a/pype/logging/tray/__init__.py b/pype/modules/logging/tray/__init__.py similarity index 100% rename from pype/logging/tray/__init__.py rename to pype/modules/logging/tray/__init__.py diff --git a/pype/logging/tray/logging_module.py b/pype/modules/logging/tray/logging_module.py similarity index 96% rename from pype/logging/tray/logging_module.py rename to pype/modules/logging/tray/logging_module.py index 30f55cd680a..15bec1aad5e 100644 --- a/pype/logging/tray/logging_module.py +++ b/pype/modules/logging/tray/logging_module.py @@ -1,7 +1,7 @@ import os from Qt import QtWidgets -from pypeapp import Logger +from pype.api import Logger from ..gui.app import LogsWindow diff --git a/pype/muster/__init__.py b/pype/modules/muster/__init__.py similarity index 100% rename from pype/muster/__init__.py rename to pype/modules/muster/__init__.py diff --git a/pype/muster/muster.py b/pype/modules/muster/muster.py similarity index 100% rename from pype/muster/muster.py rename to pype/modules/muster/muster.py diff --git a/pype/muster/widget_login.py b/pype/modules/muster/widget_login.py similarity index 100% rename from pype/muster/widget_login.py rename to pype/modules/muster/widget_login.py diff --git a/pype/services/rest_api/__init__.py b/pype/modules/rest_api/__init__.py similarity index 100% rename from pype/services/rest_api/__init__.py rename to pype/modules/rest_api/__init__.py diff --git a/pype/services/rest_api/base_class.py b/pype/modules/rest_api/base_class.py similarity index 100% rename from pype/services/rest_api/base_class.py rename to pype/modules/rest_api/base_class.py diff --git a/pype/services/rest_api/lib/__init__.py b/pype/modules/rest_api/lib/__init__.py similarity index 100% rename from pype/services/rest_api/lib/__init__.py rename to pype/modules/rest_api/lib/__init__.py diff --git a/pype/services/rest_api/lib/exceptions.py b/pype/modules/rest_api/lib/exceptions.py similarity index 100% rename from pype/services/rest_api/lib/exceptions.py rename to pype/modules/rest_api/lib/exceptions.py diff --git a/pype/services/rest_api/lib/factory.py b/pype/modules/rest_api/lib/factory.py similarity index 99% rename from pype/services/rest_api/lib/factory.py rename to pype/modules/rest_api/lib/factory.py index 39ea8474fa1..ad884eea1cb 100644 --- a/pype/services/rest_api/lib/factory.py +++ b/pype/modules/rest_api/lib/factory.py @@ -5,7 +5,7 @@ from .lib import RestMethods from queue import Queue -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger("RestApiFactory") diff --git a/pype/services/rest_api/lib/handler.py b/pype/modules/rest_api/lib/handler.py similarity index 99% rename from pype/services/rest_api/lib/handler.py rename to pype/modules/rest_api/lib/handler.py index fc4410a0bc8..93e583882bb 100644 --- a/pype/services/rest_api/lib/handler.py +++ b/pype/modules/rest_api/lib/handler.py @@ -11,7 +11,7 @@ from .exceptions import AbortException from . import RestApiFactory, Splitter -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger("RestApiHandler") diff --git a/pype/services/rest_api/lib/lib.py b/pype/modules/rest_api/lib/lib.py similarity index 100% rename from pype/services/rest_api/lib/lib.py rename to pype/modules/rest_api/lib/lib.py diff --git a/pype/services/rest_api/rest_api.py b/pype/modules/rest_api/rest_api.py similarity index 99% rename from pype/services/rest_api/rest_api.py rename to pype/modules/rest_api/rest_api.py index d600a3a8a8a..5f0969a5a29 100644 --- a/pype/services/rest_api/rest_api.py +++ b/pype/modules/rest_api/rest_api.py @@ -6,7 +6,7 @@ from http.server import HTTPServer from .lib import RestApiFactory, Handler from .base_class import route, register_statics -from pypeapp import config, Logger +from pype.api import config, Logger log = Logger().get_logger("RestApiServer") diff --git a/pype/standalonepublish/__init__.py b/pype/modules/standalonepublish/__init__.py similarity index 100% rename from pype/standalonepublish/__init__.py rename to pype/modules/standalonepublish/__init__.py diff --git a/pype/standalonepublish/__main__.py b/pype/modules/standalonepublish/__main__.py similarity index 100% rename from pype/standalonepublish/__main__.py rename to pype/modules/standalonepublish/__main__.py diff --git a/pype/standalonepublish/app.py b/pype/modules/standalonepublish/app.py similarity index 100% rename from pype/standalonepublish/app.py rename to pype/modules/standalonepublish/app.py diff --git a/pype/standalonepublish/publish.py b/pype/modules/standalonepublish/publish.py similarity index 99% rename from pype/standalonepublish/publish.py rename to pype/modules/standalonepublish/publish.py index 045b3d590e4..43d3b029dc4 100644 --- a/pype/standalonepublish/publish.py +++ b/pype/modules/standalonepublish/publish.py @@ -9,7 +9,7 @@ from avalon.tools import publish as av_publish import pype -from pypeapp import execute +from pype.api import execute import pyblish.api from . import PUBLISH_PATHS diff --git a/pype/standalonepublish/resources/__init__.py b/pype/modules/standalonepublish/resources/__init__.py similarity index 100% rename from pype/standalonepublish/resources/__init__.py rename to pype/modules/standalonepublish/resources/__init__.py diff --git a/pype/standalonepublish/resources/edit.svg b/pype/modules/standalonepublish/resources/edit.svg similarity index 100% rename from pype/standalonepublish/resources/edit.svg rename to pype/modules/standalonepublish/resources/edit.svg diff --git a/pype/standalonepublish/resources/file.png b/pype/modules/standalonepublish/resources/file.png similarity index 100% rename from pype/standalonepublish/resources/file.png rename to pype/modules/standalonepublish/resources/file.png diff --git a/pype/standalonepublish/resources/files.png b/pype/modules/standalonepublish/resources/files.png similarity index 100% rename from pype/standalonepublish/resources/files.png rename to pype/modules/standalonepublish/resources/files.png diff --git a/pype/standalonepublish/resources/houdini.png b/pype/modules/standalonepublish/resources/houdini.png similarity index 100% rename from pype/standalonepublish/resources/houdini.png rename to pype/modules/standalonepublish/resources/houdini.png diff --git a/pype/standalonepublish/resources/image_file.png b/pype/modules/standalonepublish/resources/image_file.png similarity index 100% rename from pype/standalonepublish/resources/image_file.png rename to pype/modules/standalonepublish/resources/image_file.png diff --git a/pype/standalonepublish/resources/image_files.png b/pype/modules/standalonepublish/resources/image_files.png similarity index 100% rename from pype/standalonepublish/resources/image_files.png rename to pype/modules/standalonepublish/resources/image_files.png diff --git a/pype/standalonepublish/resources/information.svg b/pype/modules/standalonepublish/resources/information.svg similarity index 100% rename from pype/standalonepublish/resources/information.svg rename to pype/modules/standalonepublish/resources/information.svg diff --git a/pype/standalonepublish/resources/maya.png b/pype/modules/standalonepublish/resources/maya.png similarity index 100% rename from pype/standalonepublish/resources/maya.png rename to pype/modules/standalonepublish/resources/maya.png diff --git a/pype/standalonepublish/resources/menu.png b/pype/modules/standalonepublish/resources/menu.png similarity index 100% rename from pype/standalonepublish/resources/menu.png rename to pype/modules/standalonepublish/resources/menu.png diff --git a/pype/standalonepublish/resources/menu_disabled.png b/pype/modules/standalonepublish/resources/menu_disabled.png similarity index 100% rename from pype/standalonepublish/resources/menu_disabled.png rename to pype/modules/standalonepublish/resources/menu_disabled.png diff --git a/pype/standalonepublish/resources/menu_hover.png b/pype/modules/standalonepublish/resources/menu_hover.png similarity index 100% rename from pype/standalonepublish/resources/menu_hover.png rename to pype/modules/standalonepublish/resources/menu_hover.png diff --git a/pype/standalonepublish/resources/menu_pressed.png b/pype/modules/standalonepublish/resources/menu_pressed.png similarity index 100% rename from pype/standalonepublish/resources/menu_pressed.png rename to pype/modules/standalonepublish/resources/menu_pressed.png diff --git a/pype/standalonepublish/resources/menu_pressed_hover.png b/pype/modules/standalonepublish/resources/menu_pressed_hover.png similarity index 100% rename from pype/standalonepublish/resources/menu_pressed_hover.png rename to pype/modules/standalonepublish/resources/menu_pressed_hover.png diff --git a/pype/standalonepublish/resources/nuke.png b/pype/modules/standalonepublish/resources/nuke.png similarity index 100% rename from pype/standalonepublish/resources/nuke.png rename to pype/modules/standalonepublish/resources/nuke.png diff --git a/pype/standalonepublish/resources/premiere.png b/pype/modules/standalonepublish/resources/premiere.png similarity index 100% rename from pype/standalonepublish/resources/premiere.png rename to pype/modules/standalonepublish/resources/premiere.png diff --git a/pype/standalonepublish/resources/trash.png b/pype/modules/standalonepublish/resources/trash.png similarity index 100% rename from pype/standalonepublish/resources/trash.png rename to pype/modules/standalonepublish/resources/trash.png diff --git a/pype/standalonepublish/resources/trash_disabled.png b/pype/modules/standalonepublish/resources/trash_disabled.png similarity index 100% rename from pype/standalonepublish/resources/trash_disabled.png rename to pype/modules/standalonepublish/resources/trash_disabled.png diff --git a/pype/standalonepublish/resources/trash_hover.png b/pype/modules/standalonepublish/resources/trash_hover.png similarity index 100% rename from pype/standalonepublish/resources/trash_hover.png rename to pype/modules/standalonepublish/resources/trash_hover.png diff --git a/pype/standalonepublish/resources/trash_pressed.png b/pype/modules/standalonepublish/resources/trash_pressed.png similarity index 100% rename from pype/standalonepublish/resources/trash_pressed.png rename to pype/modules/standalonepublish/resources/trash_pressed.png diff --git a/pype/standalonepublish/resources/trash_pressed_hover.png b/pype/modules/standalonepublish/resources/trash_pressed_hover.png similarity index 100% rename from pype/standalonepublish/resources/trash_pressed_hover.png rename to pype/modules/standalonepublish/resources/trash_pressed_hover.png diff --git a/pype/standalonepublish/resources/video_file.png b/pype/modules/standalonepublish/resources/video_file.png similarity index 100% rename from pype/standalonepublish/resources/video_file.png rename to pype/modules/standalonepublish/resources/video_file.png diff --git a/pype/standalonepublish/standalonepublish_module.py b/pype/modules/standalonepublish/standalonepublish_module.py similarity index 100% rename from pype/standalonepublish/standalonepublish_module.py rename to pype/modules/standalonepublish/standalonepublish_module.py diff --git a/pype/standalonepublish/widgets/__init__.py b/pype/modules/standalonepublish/widgets/__init__.py similarity index 100% rename from pype/standalonepublish/widgets/__init__.py rename to pype/modules/standalonepublish/widgets/__init__.py diff --git a/pype/standalonepublish/widgets/button_from_svgs.py b/pype/modules/standalonepublish/widgets/button_from_svgs.py similarity index 100% rename from pype/standalonepublish/widgets/button_from_svgs.py rename to pype/modules/standalonepublish/widgets/button_from_svgs.py diff --git a/pype/standalonepublish/widgets/model_asset.py b/pype/modules/standalonepublish/widgets/model_asset.py similarity index 100% rename from pype/standalonepublish/widgets/model_asset.py rename to pype/modules/standalonepublish/widgets/model_asset.py diff --git a/pype/standalonepublish/widgets/model_filter_proxy_exact_match.py b/pype/modules/standalonepublish/widgets/model_filter_proxy_exact_match.py similarity index 100% rename from pype/standalonepublish/widgets/model_filter_proxy_exact_match.py rename to pype/modules/standalonepublish/widgets/model_filter_proxy_exact_match.py diff --git a/pype/standalonepublish/widgets/model_filter_proxy_recursive_sort.py b/pype/modules/standalonepublish/widgets/model_filter_proxy_recursive_sort.py similarity index 100% rename from pype/standalonepublish/widgets/model_filter_proxy_recursive_sort.py rename to pype/modules/standalonepublish/widgets/model_filter_proxy_recursive_sort.py diff --git a/pype/standalonepublish/widgets/model_node.py b/pype/modules/standalonepublish/widgets/model_node.py similarity index 100% rename from pype/standalonepublish/widgets/model_node.py rename to pype/modules/standalonepublish/widgets/model_node.py diff --git a/pype/standalonepublish/widgets/model_tasks_template.py b/pype/modules/standalonepublish/widgets/model_tasks_template.py similarity index 100% rename from pype/standalonepublish/widgets/model_tasks_template.py rename to pype/modules/standalonepublish/widgets/model_tasks_template.py diff --git a/pype/standalonepublish/widgets/model_tree.py b/pype/modules/standalonepublish/widgets/model_tree.py similarity index 100% rename from pype/standalonepublish/widgets/model_tree.py rename to pype/modules/standalonepublish/widgets/model_tree.py diff --git a/pype/standalonepublish/widgets/model_tree_view_deselectable.py b/pype/modules/standalonepublish/widgets/model_tree_view_deselectable.py similarity index 100% rename from pype/standalonepublish/widgets/model_tree_view_deselectable.py rename to pype/modules/standalonepublish/widgets/model_tree_view_deselectable.py diff --git a/pype/standalonepublish/widgets/widget_asset.py b/pype/modules/standalonepublish/widgets/widget_asset.py similarity index 100% rename from pype/standalonepublish/widgets/widget_asset.py rename to pype/modules/standalonepublish/widgets/widget_asset.py diff --git a/pype/standalonepublish/widgets/widget_component_item.py b/pype/modules/standalonepublish/widgets/widget_component_item.py similarity index 100% rename from pype/standalonepublish/widgets/widget_component_item.py rename to pype/modules/standalonepublish/widgets/widget_component_item.py diff --git a/pype/standalonepublish/widgets/widget_components.py b/pype/modules/standalonepublish/widgets/widget_components.py similarity index 100% rename from pype/standalonepublish/widgets/widget_components.py rename to pype/modules/standalonepublish/widgets/widget_components.py diff --git a/pype/standalonepublish/widgets/widget_components_list.py b/pype/modules/standalonepublish/widgets/widget_components_list.py similarity index 100% rename from pype/standalonepublish/widgets/widget_components_list.py rename to pype/modules/standalonepublish/widgets/widget_components_list.py diff --git a/pype/standalonepublish/widgets/widget_drop_empty.py b/pype/modules/standalonepublish/widgets/widget_drop_empty.py similarity index 100% rename from pype/standalonepublish/widgets/widget_drop_empty.py rename to pype/modules/standalonepublish/widgets/widget_drop_empty.py diff --git a/pype/standalonepublish/widgets/widget_drop_frame.py b/pype/modules/standalonepublish/widgets/widget_drop_frame.py similarity index 99% rename from pype/standalonepublish/widgets/widget_drop_frame.py rename to pype/modules/standalonepublish/widgets/widget_drop_frame.py index c85105a3333..80e67aa69a0 100644 --- a/pype/standalonepublish/widgets/widget_drop_frame.py +++ b/pype/modules/standalonepublish/widgets/widget_drop_frame.py @@ -3,7 +3,7 @@ import json import clique import subprocess -from pypeapp import config +from pype.api import config import pype.lib from . import QtWidgets, QtCore from . import DropEmpty, ComponentsList, ComponentItem diff --git a/pype/standalonepublish/widgets/widget_family.py b/pype/modules/standalonepublish/widgets/widget_family.py similarity index 99% rename from pype/standalonepublish/widgets/widget_family.py rename to pype/modules/standalonepublish/widgets/widget_family.py index 19041a588b8..29a0812a914 100644 --- a/pype/standalonepublish/widgets/widget_family.py +++ b/pype/modules/standalonepublish/widgets/widget_family.py @@ -8,7 +8,7 @@ from . import HelpRole, FamilyRole, ExistsRole, PluginRole, PluginKeyRole from . import FamilyDescriptionWidget -from pypeapp import config +from pype.api import config class FamilyWidget(QtWidgets.QWidget): diff --git a/pype/standalonepublish/widgets/widget_family_desc.py b/pype/modules/standalonepublish/widgets/widget_family_desc.py similarity index 100% rename from pype/standalonepublish/widgets/widget_family_desc.py rename to pype/modules/standalonepublish/widgets/widget_family_desc.py diff --git a/pype/standalonepublish/widgets/widget_shadow.py b/pype/modules/standalonepublish/widgets/widget_shadow.py similarity index 100% rename from pype/standalonepublish/widgets/widget_shadow.py rename to pype/modules/standalonepublish/widgets/widget_shadow.py diff --git a/pype/services/timers_manager/__init__.py b/pype/modules/timers_manager/__init__.py similarity index 100% rename from pype/services/timers_manager/__init__.py rename to pype/modules/timers_manager/__init__.py diff --git a/pype/services/timers_manager/timers_manager.py b/pype/modules/timers_manager/timers_manager.py similarity index 96% rename from pype/services/timers_manager/timers_manager.py rename to pype/modules/timers_manager/timers_manager.py index 2259dfc34d4..cec730d0078 100644 --- a/pype/services/timers_manager/timers_manager.py +++ b/pype/modules/timers_manager/timers_manager.py @@ -1,7 +1,6 @@ from Qt import QtCore from .widget_user_idle import WidgetUserIdle -from pypeapp.lib.config import get_presets -from pypeapp import Logger +from pype.api import Logger, config class Singleton(type): @@ -36,7 +35,12 @@ def __init__(self, tray_widget, main_widget): def set_signal_times(self): try: - timer_info = get_presets()['services']['timers_manager']['timer'] + timer_info = ( + config.get_presets() + .get('services') + .get('timers_manager') + .get('timer') + ) full_time = int(float(timer_info['full_time'])*60) message_time = int(float(timer_info['message_time'])*60) self.time_show_message = full_time - message_time diff --git a/pype/services/timers_manager/widget_user_idle.py b/pype/modules/timers_manager/widget_user_idle.py similarity index 98% rename from pype/services/timers_manager/widget_user_idle.py rename to pype/modules/timers_manager/widget_user_idle.py index b65ffd40ba8..f5efcec9bb6 100644 --- a/pype/services/timers_manager/widget_user_idle.py +++ b/pype/modules/timers_manager/widget_user_idle.py @@ -1,4 +1,5 @@ -from pypeapp import style, Logger +from pype.api import Logger +from pypeapp import style from Qt import QtCore, QtGui, QtWidgets diff --git a/pype/user/__init__.py b/pype/modules/user/__init__.py similarity index 100% rename from pype/user/__init__.py rename to pype/modules/user/__init__.py diff --git a/pype/user/user_module.py b/pype/modules/user/user_module.py similarity index 98% rename from pype/user/user_module.py rename to pype/modules/user/user_module.py index 46ceb0031f8..f2de9dc2fb7 100644 --- a/pype/user/user_module.py +++ b/pype/modules/user/user_module.py @@ -6,7 +6,7 @@ from Qt import QtWidgets from .widget_user import UserWidget -from pype import api as pype +from pype.api import Logger class UserModule: @@ -16,7 +16,7 @@ class UserModule: cred_filename = 'user_info.json' env_name = "PYPE_USERNAME" - log = pype.Logger().get_logger("UserModule", "user") + log = Logger().get_logger("UserModule", "user") def __init__(self, main_parent=None, parent=None): self._callbacks_on_user_change = [] diff --git a/pype/user/widget_user.py b/pype/modules/user/widget_user.py similarity index 100% rename from pype/user/widget_user.py rename to pype/modules/user/widget_user.py diff --git a/pype/plugin.py b/pype/plugin.py index cbe8ba47d74..a169e82bebd 100644 --- a/pype/plugin.py +++ b/pype/plugin.py @@ -2,7 +2,7 @@ import os import pyblish.api -from pypeapp import config +from pype.api import config import inspect ValidatePipelineOrder = pyblish.api.ValidatorOrder + 0.05 diff --git a/pype/plugins/adobecommunicator/publish/extract_post_json.py b/pype/plugins/adobecommunicator/publish/extract_post_json.py index c545e474752..8ea64531a9e 100644 --- a/pype/plugins/adobecommunicator/publish/extract_post_json.py +++ b/pype/plugins/adobecommunicator/publish/extract_post_json.py @@ -2,7 +2,7 @@ import json import clique import pyblish.api -from pypeapp import Anatomy +from pype.api import Anatomy class ExtractJSON(pyblish.api.ContextPlugin): """ Extract all instances to a serialized json file. """ diff --git a/pype/plugins/blender/create/create_action.py b/pype/plugins/blender/create/create_action.py index 68e2a50b61e..f5273863c49 100644 --- a/pype/plugins/blender/create/create_action.py +++ b/pype/plugins/blender/create/create_action.py @@ -4,7 +4,7 @@ from avalon import api from avalon.blender import Creator, lib -import pype.blender.plugin +import pype.hosts.blender.plugin class CreateAction(Creator): @@ -19,7 +19,7 @@ def process(self): asset = self.data["asset"] subset = self.data["subset"] - name = pype.blender.plugin.asset_name(asset, subset) + name = pype.hosts.blender.plugin.asset_name(asset, subset) collection = bpy.data.collections.new(name=name) bpy.context.scene.collection.children.link(collection) self.data['task'] = api.Session.get('AVALON_TASK') diff --git a/pype/plugins/blender/create/create_animation.py b/pype/plugins/blender/create/create_animation.py index 3a5985d7a2c..de74f9a3589 100644 --- a/pype/plugins/blender/create/create_animation.py +++ b/pype/plugins/blender/create/create_animation.py @@ -4,7 +4,7 @@ from avalon import api from avalon.blender import Creator, lib -import pype.blender.plugin +import pype.hosts.blender.plugin class CreateAnimation(Creator): @@ -19,7 +19,7 @@ def process(self): asset = self.data["asset"] subset = self.data["subset"] - name = pype.blender.plugin.asset_name(asset, subset) + name = pype.hosts.blender.plugin.asset_name(asset, subset) collection = bpy.data.collections.new(name=name) bpy.context.scene.collection.children.link(collection) self.data['task'] = api.Session.get('AVALON_TASK') diff --git a/pype/plugins/blender/create/create_model.py b/pype/plugins/blender/create/create_model.py index 303a7a63a12..59905edc41a 100644 --- a/pype/plugins/blender/create/create_model.py +++ b/pype/plugins/blender/create/create_model.py @@ -4,7 +4,7 @@ from avalon import api from avalon.blender import Creator, lib -import pype.blender.plugin +import pype.hosts.blender.plugin class CreateModel(Creator): @@ -19,7 +19,7 @@ def process(self): asset = self.data["asset"] subset = self.data["subset"] - name = pype.blender.plugin.asset_name(asset, subset) + name = pype.hosts.blender.plugin.asset_name(asset, subset) collection = bpy.data.collections.new(name=name) bpy.context.scene.collection.children.link(collection) self.data['task'] = api.Session.get('AVALON_TASK') diff --git a/pype/plugins/blender/create/create_rig.py b/pype/plugins/blender/create/create_rig.py index dc97d8b4ce2..855c2ab4619 100644 --- a/pype/plugins/blender/create/create_rig.py +++ b/pype/plugins/blender/create/create_rig.py @@ -4,7 +4,7 @@ from avalon import api from avalon.blender import Creator, lib -import pype.blender.plugin +import pype.hosts.blender.plugin class CreateRig(Creator): @@ -19,7 +19,7 @@ def process(self): asset = self.data["asset"] subset = self.data["subset"] - name = pype.blender.plugin.asset_name(asset, subset) + name = pype.hosts.blender.plugin.asset_name(asset, subset) collection = bpy.data.collections.new(name=name) bpy.context.scene.collection.children.link(collection) self.data['task'] = api.Session.get('AVALON_TASK') diff --git a/pype/plugins/blender/load/load_action.py b/pype/plugins/blender/load/load_action.py index a1b1ad3ceac..d94bd9aac6e 100644 --- a/pype/plugins/blender/load/load_action.py +++ b/pype/plugins/blender/load/load_action.py @@ -7,12 +7,12 @@ from avalon import api, blender import bpy -import pype.blender.plugin +import pype.hosts.blender.plugin logger = logging.getLogger("pype").getChild("blender").getChild("load_action") -class BlendActionLoader(pype.blender.plugin.AssetLoader): +class BlendActionLoader(pype.hosts.blender.plugin.AssetLoader): """Load action from a .blend file. Warning: @@ -42,8 +42,8 @@ def process_asset( libpath = self.fname asset = context["asset"]["name"] subset = context["subset"]["name"] - lib_container = pype.blender.plugin.asset_name(asset, subset) - container_name = pype.blender.plugin.asset_name( + lib_container = pype.hosts.blender.plugin.asset_name(asset, subset) + container_name = pype.hosts.blender.plugin.asset_name( asset, subset, namespace ) @@ -149,7 +149,7 @@ def update(self, container: Dict, representation: Dict): assert libpath.is_file(), ( f"The file doesn't exist: {libpath}" ) - assert extension in pype.blender.plugin.VALID_EXTENSIONS, ( + assert extension in pype.hosts.blender.plugin.VALID_EXTENSIONS, ( f"Unsupported file: {libpath}" ) diff --git a/pype/plugins/blender/load/load_animation.py b/pype/plugins/blender/load/load_animation.py index 395684a3ba7..a26f402d474 100644 --- a/pype/plugins/blender/load/load_animation.py +++ b/pype/plugins/blender/load/load_animation.py @@ -7,14 +7,14 @@ from avalon import api, blender import bpy -import pype.blender.plugin +import pype.hosts.blender.plugin logger = logging.getLogger("pype").getChild( "blender").getChild("load_animation") -class BlendAnimationLoader(pype.blender.plugin.AssetLoader): +class BlendAnimationLoader(pype.hosts.blender.plugin.AssetLoader): """Load animations from a .blend file. Warning: @@ -109,8 +109,8 @@ def process_asset( libpath = self.fname asset = context["asset"]["name"] subset = context["subset"]["name"] - lib_container = pype.blender.plugin.asset_name(asset, subset) - container_name = pype.blender.plugin.asset_name( + lib_container = pype.hosts.blender.plugin.asset_name(asset, subset) + container_name = pype.hosts.blender.plugin.asset_name( asset, subset, namespace ) @@ -179,7 +179,7 @@ def update(self, container: Dict, representation: Dict): assert libpath.is_file(), ( f"The file doesn't exist: {libpath}" ) - assert extension in pype.blender.plugin.VALID_EXTENSIONS, ( + assert extension in pype.hosts.blender.plugin.VALID_EXTENSIONS, ( f"Unsupported file: {libpath}" ) diff --git a/pype/plugins/blender/load/load_model.py b/pype/plugins/blender/load/load_model.py index ff7c6c49c2c..2abc4175c61 100644 --- a/pype/plugins/blender/load/load_model.py +++ b/pype/plugins/blender/load/load_model.py @@ -7,12 +7,12 @@ from avalon import api, blender import bpy -import pype.blender.plugin +import pype.hosts.blender.plugin logger = logging.getLogger("pype").getChild("blender").getChild("load_model") -class BlendModelLoader(pype.blender.plugin.AssetLoader): +class BlendModelLoader(pype.hosts.blender.plugin.AssetLoader): """Load models from a .blend file. Because they come from a .blend file we can simply link the collection that @@ -96,8 +96,8 @@ def process_asset( libpath = self.fname asset = context["asset"]["name"] subset = context["subset"]["name"] - lib_container = pype.blender.plugin.asset_name(asset, subset) - container_name = pype.blender.plugin.asset_name( + lib_container = pype.hosts.blender.plugin.asset_name(asset, subset) + container_name = pype.hosts.blender.plugin.asset_name( asset, subset, namespace ) @@ -164,7 +164,7 @@ def update(self, container: Dict, representation: Dict): assert libpath.is_file(), ( f"The file doesn't exist: {libpath}" ) - assert extension in pype.blender.plugin.VALID_EXTENSIONS, ( + assert extension in pype.hosts.blender.plugin.VALID_EXTENSIONS, ( f"Unsupported file: {libpath}" ) @@ -233,7 +233,7 @@ def remove(self, container: Dict) -> bool: return True -class CacheModelLoader(pype.blender.plugin.AssetLoader): +class CacheModelLoader(pype.hosts.blender.plugin.AssetLoader): """Load cache models. Stores the imported asset in a collection named after the asset. @@ -269,7 +269,7 @@ def process_asset( subset = context["subset"]["name"] # TODO (jasper): evaluate use of namespace which is 'alien' to Blender. lib_container = container_name = ( - pype.blender.plugin.asset_name(asset, subset, namespace) + pype.hosts.blender.plugin.asset_name(asset, subset, namespace) ) relative = bpy.context.preferences.filepaths.use_relative_paths diff --git a/pype/plugins/blender/load/load_rig.py b/pype/plugins/blender/load/load_rig.py index d14a8687229..634a627a4a0 100644 --- a/pype/plugins/blender/load/load_rig.py +++ b/pype/plugins/blender/load/load_rig.py @@ -7,12 +7,12 @@ from avalon import api, blender import bpy -import pype.blender.plugin +import pype.hosts.blender.plugin logger = logging.getLogger("pype").getChild("blender").getChild("load_model") -class BlendRigLoader(pype.blender.plugin.AssetLoader): +class BlendRigLoader(pype.hosts.blender.plugin.AssetLoader): """Load rigs from a .blend file. Because they come from a .blend file we can simply link the collection that @@ -108,8 +108,8 @@ def process_asset( libpath = self.fname asset = context["asset"]["name"] subset = context["subset"]["name"] - lib_container = pype.blender.plugin.asset_name(asset, subset) - container_name = pype.blender.plugin.asset_name( + lib_container = pype.hosts.blender.plugin.asset_name(asset, subset) + container_name = pype.hosts.blender.plugin.asset_name( asset, subset, namespace ) @@ -178,7 +178,7 @@ def update(self, container: Dict, representation: Dict): assert libpath.is_file(), ( f"The file doesn't exist: {libpath}" ) - assert extension in pype.blender.plugin.VALID_EXTENSIONS, ( + assert extension in pype.hosts.blender.plugin.VALID_EXTENSIONS, ( f"Unsupported file: {libpath}" ) diff --git a/pype/plugins/blender/publish/extract_abc.py b/pype/plugins/blender/publish/extract_abc.py index d2c0c769ae3..41c9c268f7a 100644 --- a/pype/plugins/blender/publish/extract_abc.py +++ b/pype/plugins/blender/publish/extract_abc.py @@ -1,7 +1,7 @@ import os import pype.api -import pype.blender.plugin +import pype.hosts.blender.plugin import bpy @@ -61,7 +61,7 @@ def process(self, instance): except: continue - new_context = pype.blender.plugin.create_blender_context(active=selected[0], selected=selected) + new_context = pype.hosts.blender.plugin.create_blender_context(active=selected[0], selected=selected) # We set the scale of the scene for the export scene.unit_settings.scale_length = 0.01 diff --git a/pype/plugins/blender/publish/validate_mesh_has_uv.py b/pype/plugins/blender/publish/validate_mesh_has_uv.py index d0cd33645be..ea5e12918ab 100644 --- a/pype/plugins/blender/publish/validate_mesh_has_uv.py +++ b/pype/plugins/blender/publish/validate_mesh_has_uv.py @@ -3,7 +3,7 @@ import bpy import pyblish.api -import pype.blender.action +import pype.hosts.blender.action class ValidateMeshHasUvs(pyblish.api.InstancePlugin): @@ -14,7 +14,7 @@ class ValidateMeshHasUvs(pyblish.api.InstancePlugin): families = ["model"] category = "geometry" label = "Mesh Has UV's" - actions = [pype.blender.action.SelectInvalidAction] + actions = [pype.hosts.blender.action.SelectInvalidAction] optional = True @staticmethod diff --git a/pype/plugins/blender/publish/validate_mesh_no_negative_scale.py b/pype/plugins/blender/publish/validate_mesh_no_negative_scale.py index 7e3b38dd199..77057c0e681 100644 --- a/pype/plugins/blender/publish/validate_mesh_no_negative_scale.py +++ b/pype/plugins/blender/publish/validate_mesh_no_negative_scale.py @@ -3,7 +3,7 @@ import bpy import pyblish.api -import pype.blender.action +import pype.hosts.blender.action class ValidateMeshNoNegativeScale(pyblish.api.Validator): @@ -13,7 +13,7 @@ class ValidateMeshNoNegativeScale(pyblish.api.Validator): hosts = ["blender"] families = ["model"] label = "Mesh No Negative Scale" - actions = [pype.blender.action.SelectInvalidAction] + actions = [pype.hosts.blender.action.SelectInvalidAction] @staticmethod def get_invalid(instance) -> List: diff --git a/pype/plugins/fusion/load/actions.py b/pype/plugins/fusion/load/actions.py index 481c95387f8..0c86fdaad2a 100644 --- a/pype/plugins/fusion/load/actions.py +++ b/pype/plugins/fusion/load/actions.py @@ -22,7 +22,7 @@ class FusionSetFrameRangeLoader(api.Loader): def load(self, context, name, namespace, data): - from pype.fusion import lib + from pype.hosts.fusion import lib version = context['version'] version_data = version.get("data", {}) @@ -55,7 +55,7 @@ class FusionSetFrameRangeWithHandlesLoader(api.Loader): def load(self, context, name, namespace, data): - from pype.fusion import lib + from pype.hosts.fusion import lib version = context['version'] version_data = version.get("data", {}) diff --git a/pype/plugins/global/load/open_djv.py b/pype/plugins/global/load/open_djv.py index 754f583a56f..650936a4dcc 100644 --- a/pype/plugins/global/load/open_djv.py +++ b/pype/plugins/global/load/open_djv.py @@ -1,7 +1,7 @@ import os import subprocess import json -from pypeapp import config +from pype.api import config from avalon import api diff --git a/pype/plugins/global/publish/collect_anatomy_object.py b/pype/plugins/global/publish/collect_anatomy_object.py index 8c01ea5c445..17f6e16962d 100644 --- a/pype/plugins/global/publish/collect_anatomy_object.py +++ b/pype/plugins/global/publish/collect_anatomy_object.py @@ -4,10 +4,10 @@ os.environ -> AVALON_PROJECT Provides: - context -> anatomy (pypeapp.Anatomy) + context -> anatomy (pype.api.Anatomy) """ import os -from pypeapp import Anatomy +from pype.api import Anatomy import pyblish.api diff --git a/pype/plugins/global/publish/collect_datetime_data.py b/pype/plugins/global/publish/collect_datetime_data.py index f04f924e186..1ad1f22a023 100644 --- a/pype/plugins/global/publish/collect_datetime_data.py +++ b/pype/plugins/global/publish/collect_datetime_data.py @@ -5,7 +5,7 @@ """ import pyblish.api -from pypeapp import config +from pype.api import config class CollectDateTimeData(pyblish.api.ContextPlugin): diff --git a/pype/plugins/global/publish/collect_output_repre_config.py b/pype/plugins/global/publish/collect_output_repre_config.py index 73ab050bcf9..063af9ba268 100644 --- a/pype/plugins/global/publish/collect_output_repre_config.py +++ b/pype/plugins/global/publish/collect_output_repre_config.py @@ -7,7 +7,7 @@ """ import pyblish.api -from pypeapp import config +from pype.api import config class CollectOutputRepreConfig(pyblish.api.ContextPlugin): diff --git a/pype/plugins/global/publish/collect_presets.py b/pype/plugins/global/publish/collect_presets.py index 5e79c555e29..4ffb2fc0b3c 100644 --- a/pype/plugins/global/publish/collect_presets.py +++ b/pype/plugins/global/publish/collect_presets.py @@ -8,7 +8,7 @@ """ from pyblish import api -from pypeapp import config +from pype.api import config class CollectPresets(api.ContextPlugin): diff --git a/pype/plugins/houdini/publish/collect_frames.py b/pype/plugins/houdini/publish/collect_frames.py index 7df7d2b86e0..957aedbdd35 100644 --- a/pype/plugins/houdini/publish/collect_frames.py +++ b/pype/plugins/houdini/publish/collect_frames.py @@ -2,7 +2,7 @@ import re import pyblish.api -from pype.houdini import lib +from pype.hosts.houdini import lib class CollectFrames(pyblish.api.InstancePlugin): diff --git a/pype/plugins/houdini/publish/validate_animation_settings.py b/pype/plugins/houdini/publish/validate_animation_settings.py index 238dfb4fa49..bdb9f693358 100644 --- a/pype/plugins/houdini/publish/validate_animation_settings.py +++ b/pype/plugins/houdini/publish/validate_animation_settings.py @@ -1,6 +1,6 @@ import pyblish.api -from pype.houdini import lib +from pype.hosts.houdini import lib class ValidateAnimationSettings(pyblish.api.InstancePlugin): diff --git a/pype/plugins/launcher/actions/unused/PremierePro.py b/pype/plugins/launcher/actions/unused/PremierePro.py index 57aa4eb2cbc..e460af14515 100644 --- a/pype/plugins/launcher/actions/unused/PremierePro.py +++ b/pype/plugins/launcher/actions/unused/PremierePro.py @@ -3,7 +3,6 @@ from avalon import api, lib, io import pype.api as pype -from pypeapp import Anatomy class PremierePro(api.Action): @@ -44,7 +43,7 @@ def process(self, session, **kwargs): if not env.get('AVALON_WORKDIR', None): project_name = env.get("AVALON_PROJECT") - anatomy = Anatomy(project_name) + anatomy = pype.Anatomy(project_name) os.environ['AVALON_PROJECT'] = project_name io.Session['AVALON_PROJECT'] = project_name diff --git a/pype/plugins/maya/create/create_animation.py b/pype/plugins/maya/create/create_animation.py index eaa54a764d8..7bafce774ce 100644 --- a/pype/plugins/maya/create/create_animation.py +++ b/pype/plugins/maya/create/create_animation.py @@ -1,5 +1,5 @@ import avalon.maya -from pype.maya import lib +from pype.hosts.maya import lib class CreateAnimation(avalon.maya.Creator): diff --git a/pype/plugins/maya/create/create_ass.py b/pype/plugins/maya/create/create_ass.py index 6d8eda1a407..7fd66e8e15f 100644 --- a/pype/plugins/maya/create/create_ass.py +++ b/pype/plugins/maya/create/create_ass.py @@ -1,7 +1,7 @@ from collections import OrderedDict import avalon.maya -from pype.maya import lib +from pype.hosts.maya import lib from maya import cmds diff --git a/pype/plugins/maya/create/create_camera.py b/pype/plugins/maya/create/create_camera.py index c46416d4753..e40260401c6 100644 --- a/pype/plugins/maya/create/create_camera.py +++ b/pype/plugins/maya/create/create_camera.py @@ -1,5 +1,5 @@ import avalon.maya -from pype.maya import lib +from pype.hosts.maya import lib class CreateCamera(avalon.maya.Creator): diff --git a/pype/plugins/maya/create/create_look.py b/pype/plugins/maya/create/create_look.py index 49fd376db0b..5ea64cc7e4d 100644 --- a/pype/plugins/maya/create/create_look.py +++ b/pype/plugins/maya/create/create_look.py @@ -1,5 +1,5 @@ import avalon.maya -from pype.maya import lib +from pype.hosts.maya import lib class CreateLook(avalon.maya.Creator): diff --git a/pype/plugins/maya/create/create_pointcache.py b/pype/plugins/maya/create/create_pointcache.py index 1d66bb63fc7..1eb561b5ce8 100644 --- a/pype/plugins/maya/create/create_pointcache.py +++ b/pype/plugins/maya/create/create_pointcache.py @@ -1,5 +1,5 @@ import avalon.maya -from pype.maya import lib +from pype.hosts.maya import lib class CreatePointCache(avalon.maya.Creator): diff --git a/pype/plugins/maya/create/create_render.py b/pype/plugins/maya/create/create_render.py index 080c6bd55dc..b2256af4559 100644 --- a/pype/plugins/maya/create/create_render.py +++ b/pype/plugins/maya/create/create_render.py @@ -6,7 +6,7 @@ from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup -import pype.maya.lib as lib +from pype.hosts.maya import lib import avalon.maya diff --git a/pype/plugins/maya/create/create_rendersetup.py b/pype/plugins/maya/create/create_rendersetup.py index a2890b3e014..98f54f2d709 100644 --- a/pype/plugins/maya/create/create_rendersetup.py +++ b/pype/plugins/maya/create/create_rendersetup.py @@ -1,5 +1,5 @@ import avalon.maya -import pype.maya.lib as lib +from pype.hosts.maya import lib from maya import cmds @@ -26,7 +26,7 @@ def __init__(self, *args, **kwargs): # \__| | # \_____/ - # from pypeapp import config + # from pype.api import config # import maya.app.renderSetup.model.renderSetup as renderSetup # presets = config.get_presets(project=os.environ['AVALON_PROJECT']) # layer = presets['plugins']['maya']['create']['renderSetup']["layer"] diff --git a/pype/plugins/maya/create/create_review.py b/pype/plugins/maya/create/create_review.py index fcd07b7f61f..3e513032e19 100644 --- a/pype/plugins/maya/create/create_review.py +++ b/pype/plugins/maya/create/create_review.py @@ -1,6 +1,6 @@ from collections import OrderedDict import avalon.maya -from pype.maya import lib +from pype.hosts.maya import lib class CreateReview(avalon.maya.Creator): diff --git a/pype/plugins/maya/create/create_rig.py b/pype/plugins/maya/create/create_rig.py index ff5c52ed3c5..ae1de4243e8 100644 --- a/pype/plugins/maya/create/create_rig.py +++ b/pype/plugins/maya/create/create_rig.py @@ -1,6 +1,6 @@ from maya import cmds -import pype.maya.lib as lib +from pype.hosts.maya import lib import avalon.maya diff --git a/pype/plugins/maya/create/create_yeti_cache.py b/pype/plugins/maya/create/create_yeti_cache.py index c541e1a091b..a4b5cc537a7 100644 --- a/pype/plugins/maya/create/create_yeti_cache.py +++ b/pype/plugins/maya/create/create_yeti_cache.py @@ -1,7 +1,7 @@ from collections import OrderedDict import avalon.maya -from pype.maya import lib +from pype.hosts.maya import lib class CreateYetiCache(avalon.maya.Creator): diff --git a/pype/plugins/maya/create/create_yeti_rig.py b/pype/plugins/maya/create/create_yeti_rig.py index 67bc2f29c83..0b954f500d7 100644 --- a/pype/plugins/maya/create/create_yeti_rig.py +++ b/pype/plugins/maya/create/create_yeti_rig.py @@ -1,6 +1,6 @@ from maya import cmds -import pype.maya.lib as lib +from pype.hosts.maya import lib import avalon.maya diff --git a/pype/plugins/maya/load/_load_animation.py b/pype/plugins/maya/load/_load_animation.py index 1c5f99cc0e3..597689ae212 100644 --- a/pype/plugins/maya/load/_load_animation.py +++ b/pype/plugins/maya/load/_load_animation.py @@ -1,7 +1,7 @@ -import pype.maya.plugin +import pype.hosts.maya.plugin -class AbcLoader(pype.maya.plugin.ReferenceLoader): +class AbcLoader(pype.hosts.maya.plugin.ReferenceLoader): """Specific loader of Alembic for the avalon.animation family""" families = ["animation", diff --git a/pype/plugins/maya/load/load_ass.py b/pype/plugins/maya/load/load_ass.py index 929ff2450a9..210b1fde1e8 100644 --- a/pype/plugins/maya/load/load_ass.py +++ b/pype/plugins/maya/load/load_ass.py @@ -1,11 +1,11 @@ from avalon import api -import pype.maya.plugin +import pype.hosts.maya.plugin import os -from pypeapp import config +from pype.api import config import clique -class AssProxyLoader(pype.maya.plugin.ReferenceLoader): +class AssProxyLoader(pype.hosts.maya.plugin.ReferenceLoader): """Load the Proxy""" families = ["ass"] diff --git a/pype/plugins/maya/load/load_gpucache.py b/pype/plugins/maya/load/load_gpucache.py index 9e7938777eb..9930dbaac6e 100644 --- a/pype/plugins/maya/load/load_gpucache.py +++ b/pype/plugins/maya/load/load_gpucache.py @@ -1,7 +1,7 @@ from avalon import api -import pype.maya.plugin +import pype.hosts.maya.plugin import os -from pypeapp import config +from pype.api import config reload(config) diff --git a/pype/plugins/maya/load/load_look.py b/pype/plugins/maya/load/load_look.py index abbcb71df0e..b9c0d811043 100644 --- a/pype/plugins/maya/load/load_look.py +++ b/pype/plugins/maya/load/load_look.py @@ -1,11 +1,11 @@ -import pype.maya.plugin +import pype.hosts.maya.plugin from avalon import api, io import json -import pype.maya.lib +import pype.hosts.maya.lib from collections import defaultdict -class LookLoader(pype.maya.plugin.ReferenceLoader): +class LookLoader(pype.hosts.maya.plugin.ReferenceLoader): """Specific loader for lookdev""" families = ["look"] @@ -132,9 +132,9 @@ def update(self, container, representation): # region compute lookup nodes_by_id = defaultdict(list) for n in nodes: - nodes_by_id[pype.maya.lib.get_id(n)].append(n) + nodes_by_id[pype.hosts.maya.lib.get_id(n)].append(n) - pype.maya.lib.apply_attributes(attributes, nodes_by_id) + pype.hosts.maya.lib.apply_attributes(attributes, nodes_by_id) # Update metadata cmds.setAttr("{}.representation".format(node), diff --git a/pype/plugins/maya/load/load_reference.py b/pype/plugins/maya/load/load_reference.py index abd18d9bc55..5992980412a 100644 --- a/pype/plugins/maya/load/load_reference.py +++ b/pype/plugins/maya/load/load_reference.py @@ -1,11 +1,11 @@ -import pype.maya.plugin +import pype.hosts.maya.plugin from avalon import api, maya from maya import cmds import os -from pypeapp import config +from pype.api import config -class ReferenceLoader(pype.maya.plugin.ReferenceLoader): +class ReferenceLoader(pype.hosts.maya.plugin.ReferenceLoader): """Load the model""" families = ["model", diff --git a/pype/plugins/maya/load/load_rendersetup.py b/pype/plugins/maya/load/load_rendersetup.py index 91f78f5c352..b38e2988b19 100644 --- a/pype/plugins/maya/load/load_rendersetup.py +++ b/pype/plugins/maya/load/load_rendersetup.py @@ -21,7 +21,7 @@ class RenderSetupLoader(api.Loader): def load(self, context, name, namespace, data): from avalon.maya.pipeline import containerise - # from pype.maya.lib import namespaced + # from pype.hosts.maya.lib import namespaced asset = context['asset']['name'] namespace = namespace or lib.unique_namespace( diff --git a/pype/plugins/maya/load/load_vdb_to_redshift.py b/pype/plugins/maya/load/load_vdb_to_redshift.py index ee7c301b1b2..4893640b270 100644 --- a/pype/plugins/maya/load/load_vdb_to_redshift.py +++ b/pype/plugins/maya/load/load_vdb_to_redshift.py @@ -1,6 +1,6 @@ from avalon import api import os -from pypeapp import config +from pype.api import config class LoadVDBtoRedShift(api.Loader): """Load OpenVDB in a Redshift Volume Shape""" diff --git a/pype/plugins/maya/load/load_vdb_to_vray.py b/pype/plugins/maya/load/load_vdb_to_vray.py index 3b15b71e3e3..aee0ee026de 100644 --- a/pype/plugins/maya/load/load_vdb_to_vray.py +++ b/pype/plugins/maya/load/load_vdb_to_vray.py @@ -1,5 +1,5 @@ from avalon import api -from pypeapp import config +from pype.api import config import os diff --git a/pype/plugins/maya/load/load_vrayproxy.py b/pype/plugins/maya/load/load_vrayproxy.py index 35d93676a03..785488d9235 100644 --- a/pype/plugins/maya/load/load_vrayproxy.py +++ b/pype/plugins/maya/load/load_vrayproxy.py @@ -1,6 +1,6 @@ from avalon.maya import lib from avalon import api -from pypeapp import config +from pype.api import config import os import maya.cmds as cmds @@ -19,7 +19,7 @@ class VRayProxyLoader(api.Loader): def load(self, context, name, namespace, data): from avalon.maya.pipeline import containerise - from pype.maya.lib import namespaced + from pype.hosts.maya.lib import namespaced try: family = context["representation"]["context"]["family"] diff --git a/pype/plugins/maya/load/load_yeti_cache.py b/pype/plugins/maya/load/load_yeti_cache.py index 412c2bd558b..ef0b5d5efa1 100644 --- a/pype/plugins/maya/load/load_yeti_cache.py +++ b/pype/plugins/maya/load/load_yeti_cache.py @@ -8,8 +8,8 @@ from avalon import api, io from avalon.maya import lib as avalon_lib, pipeline -from pype.maya import lib -from pypeapp import config +from pype.hosts.maya import lib +from pype.api import config from pprint import pprint diff --git a/pype/plugins/maya/load/load_yeti_rig.py b/pype/plugins/maya/load/load_yeti_rig.py index 11922034d65..06049531980 100644 --- a/pype/plugins/maya/load/load_yeti_rig.py +++ b/pype/plugins/maya/load/load_yeti_rig.py @@ -1,12 +1,12 @@ import os from collections import defaultdict -from pypeapp import config -import pype.maya.plugin -from pype.maya import lib +from pype.api import config +import pype.hosts.maya.plugin +from pype.hosts.maya import lib -class YetiRigLoader(pype.maya.plugin.ReferenceLoader): +class YetiRigLoader(pype.hosts.maya.plugin.ReferenceLoader): """ This loader will load Yeti rig. You can select something in scene and if it has same ID as mesh published with rig, their shapes will be linked diff --git a/pype/plugins/maya/publish/collect_assembly.py b/pype/plugins/maya/publish/collect_assembly.py index 76274b1032e..f9a933d8e89 100644 --- a/pype/plugins/maya/publish/collect_assembly.py +++ b/pype/plugins/maya/publish/collect_assembly.py @@ -3,7 +3,7 @@ from maya import cmds, mel from avalon import maya as avalon -from pype.maya import lib +from pype.hosts.maya import lib # TODO : Publish of assembly: -unique namespace for all assets, VALIDATOR! diff --git a/pype/plugins/maya/publish/collect_look.py b/pype/plugins/maya/publish/collect_look.py index 1a27ffe5ffd..6dc66711dac 100644 --- a/pype/plugins/maya/publish/collect_look.py +++ b/pype/plugins/maya/publish/collect_look.py @@ -4,7 +4,7 @@ from maya import cmds import pyblish.api -import pype.maya.lib as lib +from pype.hosts.maya import lib SHAPE_ATTRS = ["castsShadows", "receiveShadows", diff --git a/pype/plugins/maya/publish/collect_render.py b/pype/plugins/maya/publish/collect_render.py index dbc0594c7c2..15f756caec7 100644 --- a/pype/plugins/maya/publish/collect_render.py +++ b/pype/plugins/maya/publish/collect_render.py @@ -50,7 +50,7 @@ import pyblish.api from avalon import maya, api -import pype.maya.lib as lib +from pype.hosts.maya import lib R_SINGLE_FRAME = re.compile(r"^(-?)\d+$") diff --git a/pype/plugins/maya/publish/collect_render_layer_aovs.py b/pype/plugins/maya/publish/collect_render_layer_aovs.py index 23cd0b29578..ff44497d6dc 100644 --- a/pype/plugins/maya/publish/collect_render_layer_aovs.py +++ b/pype/plugins/maya/publish/collect_render_layer_aovs.py @@ -2,7 +2,7 @@ import pyblish.api -import pype.maya.lib as lib +from pype.hosts.maya import lib class CollectRenderLayerAOVS(pyblish.api.InstancePlugin): diff --git a/pype/plugins/maya/publish/collect_renderable_camera.py b/pype/plugins/maya/publish/collect_renderable_camera.py index 13b847cee4d..a7d613517bb 100644 --- a/pype/plugins/maya/publish/collect_renderable_camera.py +++ b/pype/plugins/maya/publish/collect_renderable_camera.py @@ -2,7 +2,7 @@ from maya import cmds -from pype.maya import lib +from pype.hosts.maya import lib class CollectRenderableCamera(pyblish.api.InstancePlugin): diff --git a/pype/plugins/maya/publish/collect_scene.py b/pype/plugins/maya/publish/collect_scene.py index b94707fc7fe..be2a294f261 100644 --- a/pype/plugins/maya/publish/collect_scene.py +++ b/pype/plugins/maya/publish/collect_scene.py @@ -1,7 +1,7 @@ import pyblish.api import avalon.api import os -from pype.maya import cmds +from maya import cmds class CollectMayaScene(pyblish.api.ContextPlugin): diff --git a/pype/plugins/maya/publish/collect_yeti_cache.py b/pype/plugins/maya/publish/collect_yeti_cache.py index c5300ff0ee3..4af3e1ea18c 100644 --- a/pype/plugins/maya/publish/collect_yeti_cache.py +++ b/pype/plugins/maya/publish/collect_yeti_cache.py @@ -2,7 +2,7 @@ import pyblish.api -from pype.maya import lib +from pype.hosts.maya import lib SETTINGS = {"renderDensity", "renderWidth", diff --git a/pype/plugins/maya/publish/collect_yeti_rig.py b/pype/plugins/maya/publish/collect_yeti_rig.py index c743b2c00b9..8a7971f3ae5 100644 --- a/pype/plugins/maya/publish/collect_yeti_rig.py +++ b/pype/plugins/maya/publish/collect_yeti_rig.py @@ -5,7 +5,7 @@ import pyblish.api -from pype.maya import lib +from pype.hosts.maya import lib from pype.lib import pairwise diff --git a/pype/plugins/maya/publish/extract_animation.py b/pype/plugins/maya/publish/extract_animation.py index 0f94ed48371..bd57eca0f88 100644 --- a/pype/plugins/maya/publish/extract_animation.py +++ b/pype/plugins/maya/publish/extract_animation.py @@ -4,7 +4,7 @@ import avalon.maya import pype.api -from pype.maya.lib import extract_alembic +from pype.hosts.maya.lib import extract_alembic class ExtractAnimation(pype.api.Extractor): diff --git a/pype/plugins/maya/publish/extract_assembly.py b/pype/plugins/maya/publish/extract_assembly.py index c12d57e8362..8c5264713df 100644 --- a/pype/plugins/maya/publish/extract_assembly.py +++ b/pype/plugins/maya/publish/extract_assembly.py @@ -3,7 +3,7 @@ import os import pype.api -from pype.maya.lib import extract_alembic +from pype.hosts.maya.lib import extract_alembic from maya import cmds diff --git a/pype/plugins/maya/publish/extract_assproxy.py b/pype/plugins/maya/publish/extract_assproxy.py index 59684febe18..0f97d047c1d 100644 --- a/pype/plugins/maya/publish/extract_assproxy.py +++ b/pype/plugins/maya/publish/extract_assproxy.py @@ -5,7 +5,7 @@ import avalon.maya import pype.api -import pype.maya.lib as lib +from pype.hosts.maya import lib class ExtractAssProxy(pype.api.Extractor): diff --git a/pype/plugins/maya/publish/extract_camera_alembic.py b/pype/plugins/maya/publish/extract_camera_alembic.py index e0e3f8407db..cc090760ff1 100644 --- a/pype/plugins/maya/publish/extract_camera_alembic.py +++ b/pype/plugins/maya/publish/extract_camera_alembic.py @@ -5,7 +5,7 @@ import avalon.maya import pype.api -import pype.maya.lib as lib +from pype.hosts.maya import lib class ExtractCameraAlembic(pype.api.Extractor): diff --git a/pype/plugins/maya/publish/extract_camera_mayaAscii.py b/pype/plugins/maya/publish/extract_camera_mayaAscii.py index ef80ed4ad4c..973d8d452a7 100644 --- a/pype/plugins/maya/publish/extract_camera_mayaAscii.py +++ b/pype/plugins/maya/publish/extract_camera_mayaAscii.py @@ -5,7 +5,7 @@ import avalon.maya import pype.api from pype.lib import grouper -from pype.maya import lib +from pype.hosts.maya import lib def massage_ma_file(path): diff --git a/pype/plugins/maya/publish/extract_look.py b/pype/plugins/maya/publish/extract_look.py index 58196433aab..f402f61329c 100644 --- a/pype/plugins/maya/publish/extract_look.py +++ b/pype/plugins/maya/publish/extract_look.py @@ -14,7 +14,7 @@ from avalon import io, api import pype.api -import pype.maya.lib as lib +from pype.hosts.maya import lib # Modes for transfer COPY = 1 diff --git a/pype/plugins/maya/publish/extract_model.py b/pype/plugins/maya/publish/extract_model.py index d6e5e66c236..ba56194eea7 100644 --- a/pype/plugins/maya/publish/extract_model.py +++ b/pype/plugins/maya/publish/extract_model.py @@ -4,7 +4,7 @@ import avalon.maya import pype.api -import pype.maya.lib as lib +from pype.hosts.maya import lib class ExtractModel(pype.api.Extractor): diff --git a/pype/plugins/maya/publish/extract_playblast.py b/pype/plugins/maya/publish/extract_playblast.py index 579712018c9..8d45f98b90b 100644 --- a/pype/plugins/maya/publish/extract_playblast.py +++ b/pype/plugins/maya/publish/extract_playblast.py @@ -4,7 +4,7 @@ import clique import capture -import pype.maya.lib as lib +from pype.hosts.maya import lib import pype.api from maya import cmds diff --git a/pype/plugins/maya/publish/extract_pointcache.py b/pype/plugins/maya/publish/extract_pointcache.py index e40ab6e7da0..e43685cac80 100644 --- a/pype/plugins/maya/publish/extract_pointcache.py +++ b/pype/plugins/maya/publish/extract_pointcache.py @@ -4,7 +4,7 @@ import avalon.maya import pype.api -from pype.maya.lib import extract_alembic +from pype.hosts.maya.lib import extract_alembic class ExtractAlembic(pype.api.Extractor): diff --git a/pype/plugins/maya/publish/extract_thumbnail.py b/pype/plugins/maya/publish/extract_thumbnail.py index 8377af1ac01..c0eb2a608ef 100644 --- a/pype/plugins/maya/publish/extract_thumbnail.py +++ b/pype/plugins/maya/publish/extract_thumbnail.py @@ -4,7 +4,7 @@ import capture -import pype.maya.lib as lib +from pype.hosts.maya import lib import pype.api from maya import cmds diff --git a/pype/plugins/maya/publish/extract_yeti_rig.py b/pype/plugins/maya/publish/extract_yeti_rig.py index f82cd75c305..d7bbcd6555a 100644 --- a/pype/plugins/maya/publish/extract_yeti_rig.py +++ b/pype/plugins/maya/publish/extract_yeti_rig.py @@ -6,7 +6,7 @@ import avalon.maya.lib as lib import pype.api -import pype.maya.lib as maya +import pype.hosts.maya.lib as maya @contextlib.contextmanager diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/plugins/maya/publish/submit_maya_deadline.py index 89e7393fe5a..0c2bb476326 100644 --- a/pype/plugins/maya/publish/submit_maya_deadline.py +++ b/pype/plugins/maya/publish/submit_maya_deadline.py @@ -21,7 +21,7 @@ import pyblish.api -import pype.maya.lib as lib +from pype.hosts.maya import lib def get_renderer_variables(renderlayer=None): diff --git a/pype/plugins/maya/publish/submit_maya_muster.py b/pype/plugins/maya/publish/submit_maya_muster.py index c6660fe6010..5a2e5787938 100644 --- a/pype/plugins/maya/publish/submit_maya_muster.py +++ b/pype/plugins/maya/publish/submit_maya_muster.py @@ -10,8 +10,8 @@ from avalon.vendor import requests import pyblish.api -import pype.maya.lib as lib -from pypeapp import config +from pype.hosts.maya import lib +from pype.api import config # mapping between Maya renderer names and Muster template ids diff --git a/pype/plugins/maya/publish/validate_animation_content.py b/pype/plugins/maya/publish/validate_animation_content.py index 4dd56e9c091..63f1135fdc8 100644 --- a/pype/plugins/maya/publish/validate_animation_content.py +++ b/pype/plugins/maya/publish/validate_animation_content.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateAnimationContent(pyblish.api.InstancePlugin): @@ -15,7 +15,7 @@ class ValidateAnimationContent(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["animation"] label = "Animation Content" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py b/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py index d41b13252f0..4fe676404cc 100644 --- a/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py +++ b/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin): @@ -20,7 +20,7 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin): families = ['animation', "pointcache"] hosts = ['maya'] label = 'Animation Out Set Related Node Ids' - actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_ass_relative_paths.py b/pype/plugins/maya/publish/validate_ass_relative_paths.py index b64e23e92c3..22ebf52d499 100644 --- a/pype/plugins/maya/publish/validate_ass_relative_paths.py +++ b/pype/plugins/maya/publish/validate_ass_relative_paths.py @@ -5,7 +5,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateAssRelativePaths(pyblish.api.InstancePlugin): diff --git a/pype/plugins/maya/publish/validate_assembly_name.py b/pype/plugins/maya/publish/validate_assembly_name.py index 2a3a92e9508..934275ca477 100644 --- a/pype/plugins/maya/publish/validate_assembly_name.py +++ b/pype/plugins/maya/publish/validate_assembly_name.py @@ -1,6 +1,6 @@ import pyblish.api import maya.cmds as cmds -import pype.maya.action +import pype.hosts.maya.action class ValidateAssemblyName(pyblish.api.InstancePlugin): @@ -12,7 +12,7 @@ class ValidateAssemblyName(pyblish.api.InstancePlugin): label = "Validate Assembly Name" order = pyblish.api.ValidatorOrder families = ["assembly"] - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] active = False @classmethod diff --git a/pype/plugins/maya/publish/validate_assembly_namespaces.py b/pype/plugins/maya/publish/validate_assembly_namespaces.py index f4519e9f4ef..50fda1a758f 100644 --- a/pype/plugins/maya/publish/validate_assembly_namespaces.py +++ b/pype/plugins/maya/publish/validate_assembly_namespaces.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin): @@ -18,7 +18,7 @@ class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin): label = "Validate Assembly Namespaces" order = pyblish.api.ValidatorOrder families = ["assembly"] - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_assembly_transforms.py b/pype/plugins/maya/publish/validate_assembly_transforms.py index 9d46655cdc5..c033f5374a1 100644 --- a/pype/plugins/maya/publish/validate_assembly_transforms.py +++ b/pype/plugins/maya/publish/validate_assembly_transforms.py @@ -3,7 +3,7 @@ from maya import cmds -import pype.maya.action +import pype.hosts.maya.action class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): @@ -28,7 +28,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.49 label = "Assembly Model Transforms" families = ["assembly"] - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] prompt_message = ("You are about to reset the matrix to the default values." @@ -44,7 +44,7 @@ def process(self, instance): @classmethod def get_invalid(cls, instance): - import pype.maya.lib as lib + from pype.hosts.maya import lib # Get all transforms in the loaded containers container_roots = cmds.listRelatives(instance.data["hierarchy"], @@ -89,7 +89,7 @@ def repair(cls, instance): """ - import pype.maya.lib as lib + from pype.hosts.maya import lib from avalon.vendor.Qt import QtWidgets # Store namespace in variable, cosmetics thingy diff --git a/pype/plugins/maya/publish/validate_camera_attributes.py b/pype/plugins/maya/publish/validate_camera_attributes.py index 8223d87c5d4..1a1005d0f77 100644 --- a/pype/plugins/maya/publish/validate_camera_attributes.py +++ b/pype/plugins/maya/publish/validate_camera_attributes.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateCameraAttributes(pyblish.api.InstancePlugin): @@ -18,7 +18,7 @@ class ValidateCameraAttributes(pyblish.api.InstancePlugin): families = ['camera'] hosts = ['maya'] label = 'Camera Attributes' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] DEFAULTS = [ ("filmFitOffset", 0.0), diff --git a/pype/plugins/maya/publish/validate_camera_contents.py b/pype/plugins/maya/publish/validate_camera_contents.py index f3e2a6c1213..27e2031e87b 100644 --- a/pype/plugins/maya/publish/validate_camera_contents.py +++ b/pype/plugins/maya/publish/validate_camera_contents.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateCameraContents(pyblish.api.InstancePlugin): @@ -19,7 +19,7 @@ class ValidateCameraContents(pyblish.api.InstancePlugin): families = ['camera'] hosts = ['maya'] label = 'Camera Contents' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_color_sets.py b/pype/plugins/maya/publish/validate_color_sets.py index 8dd78bbc6a6..b1d8847f77c 100644 --- a/pype/plugins/maya/publish/validate_color_sets.py +++ b/pype/plugins/maya/publish/validate_color_sets.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateColorSets(pyblish.api.Validator): @@ -18,7 +18,7 @@ class ValidateColorSets(pyblish.api.Validator): families = ['model'] category = 'geometry' label = 'Mesh ColorSets' - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] optional = True diff --git a/pype/plugins/maya/publish/validate_instance_has_members.py b/pype/plugins/maya/publish/validate_instance_has_members.py index 76c93b4c850..04e7e1c5eb9 100644 --- a/pype/plugins/maya/publish/validate_instance_has_members.py +++ b/pype/plugins/maya/publish/validate_instance_has_members.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateInstanceHasMembers(pyblish.api.InstancePlugin): @@ -9,7 +9,7 @@ class ValidateInstanceHasMembers(pyblish.api.InstancePlugin): order = pype.api.ValidateContentsOrder hosts = ["maya"] label = 'Instance has members' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_instancer_content.py b/pype/plugins/maya/publish/validate_instancer_content.py index 68ee17bca61..a398aead02c 100644 --- a/pype/plugins/maya/publish/validate_instancer_content.py +++ b/pype/plugins/maya/publish/validate_instancer_content.py @@ -1,7 +1,7 @@ import maya.cmds as cmds import pyblish.api -import pype.maya.lib as lib +from pype.hosts.maya import lib class ValidateInstancerContent(pyblish.api.InstancePlugin): diff --git a/pype/plugins/maya/publish/validate_joints_hidden.py b/pype/plugins/maya/publish/validate_joints_hidden.py index 4b200606029..80ca29bfbf5 100644 --- a/pype/plugins/maya/publish/validate_joints_hidden.py +++ b/pype/plugins/maya/publish/validate_joints_hidden.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateJointsHidden(pyblish.api.InstancePlugin): @@ -23,7 +23,7 @@ class ValidateJointsHidden(pyblish.api.InstancePlugin): category = 'rig' version = (0, 1, 0) label = "Joints Hidden" - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] @staticmethod diff --git a/pype/plugins/maya/publish/validate_look_contents.py b/pype/plugins/maya/publish/validate_look_contents.py index d9cd2c92b1f..577c88a7e33 100644 --- a/pype/plugins/maya/publish/validate_look_contents.py +++ b/pype/plugins/maya/publish/validate_look_contents.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateLookContents(pyblish.api.InstancePlugin): @@ -21,7 +21,7 @@ class ValidateLookContents(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Look Data Contents' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_look_id_reference_edits.py b/pype/plugins/maya/publish/validate_look_id_reference_edits.py index 6a28daa7dc7..de44a3b31af 100644 --- a/pype/plugins/maya/publish/validate_look_id_reference_edits.py +++ b/pype/plugins/maya/publish/validate_look_id_reference_edits.py @@ -3,7 +3,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin): @@ -20,7 +20,7 @@ class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Look Id Reference Edits' - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_look_members_unique.py b/pype/plugins/maya/publish/validate_look_members_unique.py index e9fb20d8d6b..8b6dd60e706 100644 --- a/pype/plugins/maya/publish/validate_look_members_unique.py +++ b/pype/plugins/maya/publish/validate_look_members_unique.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin): @@ -25,8 +25,8 @@ class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin): hosts = ['maya'] families = ['look'] - actions = [pype.maya.action.SelectInvalidAction, - pype.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, + pype.hosts.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_look_no_default_shaders.py b/pype/plugins/maya/publish/validate_look_no_default_shaders.py index dbef871a16c..87859d390f6 100644 --- a/pype/plugins/maya/publish/validate_look_no_default_shaders.py +++ b/pype/plugins/maya/publish/validate_look_no_default_shaders.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin): @@ -27,7 +27,7 @@ class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Look No Default Shaders' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] DEFAULT_SHADERS = {"lambert1", "initialShadingGroup", "initialParticleSE", "particleCloud1"} diff --git a/pype/plugins/maya/publish/validate_look_sets.py b/pype/plugins/maya/publish/validate_look_sets.py index ebc39bd3baf..4e06b564ed1 100644 --- a/pype/plugins/maya/publish/validate_look_sets.py +++ b/pype/plugins/maya/publish/validate_look_sets.py @@ -1,5 +1,5 @@ -import pype.maya.action -from pype.maya import lib +import pype.hosts.maya.action +from pype.hosts.maya import lib import pyblish.api import pype.api @@ -42,7 +42,7 @@ class ValidateLookSets(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Look Sets' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_look_shading_group.py b/pype/plugins/maya/publish/validate_look_shading_group.py index 91558390bc4..e8911e3f2fe 100644 --- a/pype/plugins/maya/publish/validate_look_shading_group.py +++ b/pype/plugins/maya/publish/validate_look_shading_group.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateShadingEngine(pyblish.api.InstancePlugin): @@ -16,7 +16,7 @@ class ValidateShadingEngine(pyblish.api.InstancePlugin): hosts = ["maya"] label = "Look Shading Engine Naming" actions = [ - pype.maya.action.SelectInvalidAction, pype.api.RepairAction + pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction ] # The default connections to check diff --git a/pype/plugins/maya/publish/validate_look_single_shader.py b/pype/plugins/maya/publish/validate_look_single_shader.py index a60d1f1817d..600652d16d7 100644 --- a/pype/plugins/maya/publish/validate_look_single_shader.py +++ b/pype/plugins/maya/publish/validate_look_single_shader.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateSingleShader(pyblish.api.InstancePlugin): @@ -16,7 +16,7 @@ class ValidateSingleShader(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Look Single Shader Per Shape' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] # The default connections to check def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_maya_units.py b/pype/plugins/maya/publish/validate_maya_units.py index f1e8f435f03..8712a90f449 100644 --- a/pype/plugins/maya/publish/validate_maya_units.py +++ b/pype/plugins/maya/publish/validate_maya_units.py @@ -3,7 +3,7 @@ import pyblish.api import pype.api from pype import lib -import pype.maya.lib as mayalib +import pype.hosts.maya.lib as mayalib from math import ceil diff --git a/pype/plugins/maya/publish/validate_mesh_arnold_attributes.py b/pype/plugins/maya/publish/validate_mesh_arnold_attributes.py index 3f264478193..1ddf0285d49 100644 --- a/pype/plugins/maya/publish/validate_mesh_arnold_attributes.py +++ b/pype/plugins/maya/publish/validate_mesh_arnold_attributes.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action from avalon import maya @@ -19,7 +19,7 @@ class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin): category = "geometry" label = "Mesh Arnold Attributes" actions = [ - pype.maya.action.SelectInvalidAction, + pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction ] optional = True diff --git a/pype/plugins/maya/publish/validate_mesh_has_uv.py b/pype/plugins/maya/publish/validate_mesh_has_uv.py index 0eb235db0fb..f7b9b8503dc 100644 --- a/pype/plugins/maya/publish/validate_mesh_has_uv.py +++ b/pype/plugins/maya/publish/validate_mesh_has_uv.py @@ -4,7 +4,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action def len_flattened(components): @@ -50,7 +50,7 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin): families = ['model'] category = 'geometry' label = 'Mesh Has UVs' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] optional = True @classmethod diff --git a/pype/plugins/maya/publish/validate_mesh_lamina_faces.py b/pype/plugins/maya/publish/validate_mesh_lamina_faces.py index 9e6e0f40b7a..5ebb41b6f9c 100644 --- a/pype/plugins/maya/publish/validate_mesh_lamina_faces.py +++ b/pype/plugins/maya/publish/validate_mesh_lamina_faces.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin): @@ -18,7 +18,7 @@ class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin): category = 'geometry' version = (0, 1, 0) label = 'Mesh Lamina Faces' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py b/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py index ed2ded652bb..988c94e4eff 100644 --- a/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py +++ b/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateMeshNoNegativeScale(pyblish.api.Validator): @@ -21,7 +21,7 @@ class ValidateMeshNoNegativeScale(pyblish.api.Validator): hosts = ['maya'] families = ['model'] label = 'Mesh No Negative Scale' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_non_manifold.py b/pype/plugins/maya/publish/validate_mesh_non_manifold.py index 961e6e42ef1..7559e9e17b0 100644 --- a/pype/plugins/maya/publish/validate_mesh_non_manifold.py +++ b/pype/plugins/maya/publish/validate_mesh_non_manifold.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateMeshNonManifold(pyblish.api.Validator): @@ -17,7 +17,7 @@ class ValidateMeshNonManifold(pyblish.api.Validator): hosts = ['maya'] families = ['model'] label = 'Mesh Non-Manifold Vertices/Edges' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py b/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py index 7d2c126af92..0d30312cad9 100644 --- a/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py +++ b/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin): @@ -22,7 +22,7 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin): category = 'geometry' version = (0, 1, 0) label = 'Mesh Edge Length Non Zero' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] optional = True __tolerance = 1e-5 diff --git a/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py b/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py index faa1c8e2481..a764611b5c1 100644 --- a/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py +++ b/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateMeshNormalsUnlocked(pyblish.api.Validator): @@ -19,7 +19,7 @@ class ValidateMeshNormalsUnlocked(pyblish.api.Validator): category = 'geometry' version = (0, 1, 0) label = 'Mesh Normals Unlocked' - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] optional = True diff --git a/pype/plugins/maya/publish/validate_mesh_overlapping_uvs.py b/pype/plugins/maya/publish/validate_mesh_overlapping_uvs.py index 8f8df71b347..c6479675d2d 100644 --- a/pype/plugins/maya/publish/validate_mesh_overlapping_uvs.py +++ b/pype/plugins/maya/publish/validate_mesh_overlapping_uvs.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action import math import maya.api.OpenMaya as om import pymel.core as pm @@ -235,7 +235,7 @@ class ValidateMeshHasOverlappingUVs(pyblish.api.InstancePlugin): families = ['model'] category = 'geometry' label = 'Mesh Has Overlapping UVs' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] optional = True @classmethod diff --git a/pype/plugins/maya/publish/validate_mesh_shader_connections.py b/pype/plugins/maya/publish/validate_mesh_shader_connections.py index 048b1468861..a31df7c0aec 100644 --- a/pype/plugins/maya/publish/validate_mesh_shader_connections.py +++ b/pype/plugins/maya/publish/validate_mesh_shader_connections.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action def pairs(iterable): @@ -77,7 +77,7 @@ class ValidateMeshShaderConnections(pyblish.api.InstancePlugin): hosts = ['maya'] families = ['model'] label = "Mesh Shader Connections" - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_mesh_single_uv_set.py b/pype/plugins/maya/publish/validate_mesh_single_uv_set.py index eeddeb3c9cd..87d83c070ee 100644 --- a/pype/plugins/maya/publish/validate_mesh_single_uv_set.py +++ b/pype/plugins/maya/publish/validate_mesh_single_uv_set.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin): @@ -22,7 +22,7 @@ class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin): optional = True version = (0, 1, 0) label = "Mesh Single UV Set" - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] @staticmethod diff --git a/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py b/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py index 8794fa9de11..8bf5c55f65d 100644 --- a/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py +++ b/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin): @@ -20,7 +20,7 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin): families = ['model'] optional = True label = "Mesh has map1 UV Set" - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] @staticmethod diff --git a/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py b/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py index 2aaf11f6c07..2dd65da7d2d 100644 --- a/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py +++ b/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py @@ -4,7 +4,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action def len_flattened(components): @@ -62,7 +62,7 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin): families = ['model'] category = 'geometry' label = 'Mesh Vertices Have Edges' - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] @classmethod diff --git a/pype/plugins/maya/publish/validate_model_content.py b/pype/plugins/maya/publish/validate_model_content.py index 2a34d606cbf..fd7c69ead7c 100644 --- a/pype/plugins/maya/publish/validate_model_content.py +++ b/pype/plugins/maya/publish/validate_model_content.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateModelContent(pyblish.api.InstancePlugin): @@ -18,7 +18,7 @@ class ValidateModelContent(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["model"] label = "Model Content" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_model_name.py b/pype/plugins/maya/publish/validate_model_name.py index 89c629c5a48..716b7d5f980 100644 --- a/pype/plugins/maya/publish/validate_model_name.py +++ b/pype/plugins/maya/publish/validate_model_name.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action import re @@ -18,7 +18,7 @@ class ValidateModelName(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["model"] label = "Model Name" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] # path to shader names definitions # TODO: move it to preset file material_file = None diff --git a/pype/plugins/maya/publish/validate_muster_connection.py b/pype/plugins/maya/publish/validate_muster_connection.py index 1c49c954463..d125542cda0 100644 --- a/pype/plugins/maya/publish/validate_muster_connection.py +++ b/pype/plugins/maya/publish/validate_muster_connection.py @@ -5,7 +5,7 @@ import pyblish.api from avalon.vendor import requests from pype.plugin import contextplugin_should_run -import pype.maya.action +import pype.hosts.maya.action class ValidateMusterConnection(pyblish.api.ContextPlugin): diff --git a/pype/plugins/maya/publish/validate_no_animation.py b/pype/plugins/maya/publish/validate_no_animation.py index 21749de7cbf..fc198745c0b 100644 --- a/pype/plugins/maya/publish/validate_no_animation.py +++ b/pype/plugins/maya/publish/validate_no_animation.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateNoAnimation(pyblish.api.Validator): @@ -19,7 +19,7 @@ class ValidateNoAnimation(pyblish.api.Validator): hosts = ["maya"] families = ["model"] optional = True - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_no_default_camera.py b/pype/plugins/maya/publish/validate_no_default_camera.py index 3d523e89747..876612c0760 100644 --- a/pype/plugins/maya/publish/validate_no_default_camera.py +++ b/pype/plugins/maya/publish/validate_no_default_camera.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateNoDefaultCameras(pyblish.api.InstancePlugin): @@ -18,7 +18,7 @@ class ValidateNoDefaultCameras(pyblish.api.InstancePlugin): families = ['camera'] version = (0, 1, 0) label = "No Default Cameras" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_no_namespace.py b/pype/plugins/maya/publish/validate_no_namespace.py index 626dbcd4b8e..6a6c7792c5e 100644 --- a/pype/plugins/maya/publish/validate_no_namespace.py +++ b/pype/plugins/maya/publish/validate_no_namespace.py @@ -3,7 +3,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action def get_namespace(node_name): @@ -22,7 +22,7 @@ class ValidateNoNamespace(pyblish.api.InstancePlugin): category = 'cleanup' version = (0, 1, 0) label = 'No Namespaces' - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] @staticmethod diff --git a/pype/plugins/maya/publish/validate_no_null_transforms.py b/pype/plugins/maya/publish/validate_no_null_transforms.py index 156e0528a13..aa35c47339b 100644 --- a/pype/plugins/maya/publish/validate_no_null_transforms.py +++ b/pype/plugins/maya/publish/validate_no_null_transforms.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action def has_shape_children(node): @@ -44,7 +44,7 @@ class ValidateNoNullTransforms(pyblish.api.InstancePlugin): version = (0, 1, 0) label = 'No Empty/Null Transforms' actions = [pype.api.RepairAction, - pype.maya.action.SelectInvalidAction] + pype.hosts.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_no_unknown_nodes.py b/pype/plugins/maya/publish/validate_no_unknown_nodes.py index cc2b9fc0098..04c8fd04bcc 100644 --- a/pype/plugins/maya/publish/validate_no_unknown_nodes.py +++ b/pype/plugins/maya/publish/validate_no_unknown_nodes.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateNoUnknownNodes(pyblish.api.InstancePlugin): @@ -21,7 +21,7 @@ class ValidateNoUnknownNodes(pyblish.api.InstancePlugin): families = ['model', 'rig'] optional = True label = "Unknown Nodes" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_node_ids.py b/pype/plugins/maya/publish/validate_node_ids.py index 9102ef13edc..777d810c804 100644 --- a/pype/plugins/maya/publish/validate_node_ids.py +++ b/pype/plugins/maya/publish/validate_node_ids.py @@ -1,8 +1,8 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action -from pype.maya import lib +from pype.hosts.maya import lib class ValidateNodeIDs(pyblish.api.InstancePlugin): @@ -25,8 +25,8 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin): "yetiRig", "assembly"] - actions = [pype.maya.action.SelectInvalidAction, - pype.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, + pype.hosts.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py b/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py index d8880e5c85b..49b78f79bc3 100644 --- a/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py +++ b/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin): @@ -20,7 +20,7 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Deformed shape ids' - actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_node_ids_in_database.py b/pype/plugins/maya/publish/validate_node_ids_in_database.py index fdcf0b20b04..15241411b76 100644 --- a/pype/plugins/maya/publish/validate_node_ids_in_database.py +++ b/pype/plugins/maya/publish/validate_node_ids_in_database.py @@ -3,8 +3,8 @@ from avalon import io import pype.api -import pype.maya.action -from pype.maya import lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin): @@ -23,8 +23,8 @@ class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin): hosts = ['maya'] families = ["*"] - actions = [pype.maya.action.SelectInvalidAction, - pype.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, + pype.hosts.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/pype/plugins/maya/publish/validate_node_ids_related.py b/pype/plugins/maya/publish/validate_node_ids_related.py index 191ac0c2f8d..193e53440a7 100644 --- a/pype/plugins/maya/publish/validate_node_ids_related.py +++ b/pype/plugins/maya/publish/validate_node_ids_related.py @@ -2,9 +2,9 @@ import pype.api from avalon import io -import pype.maya.action +import pype.hosts.maya.action -from pype.maya import lib +from pype.hosts.maya import lib class ValidateNodeIDsRelated(pyblish.api.InstancePlugin): @@ -20,8 +20,8 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin): "rig"] optional = True - actions = [pype.maya.action.SelectInvalidAction, - pype.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, + pype.hosts.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all nodes in instance (including hierarchy)""" diff --git a/pype/plugins/maya/publish/validate_node_ids_unique.py b/pype/plugins/maya/publish/validate_node_ids_unique.py index 31e5e673deb..3a66941f897 100644 --- a/pype/plugins/maya/publish/validate_node_ids_unique.py +++ b/pype/plugins/maya/publish/validate_node_ids_unique.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): @@ -20,8 +20,8 @@ class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): "rig", "yetiRig"] - actions = [pype.maya.action.SelectInvalidAction, - pype.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, + pype.hosts.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_node_no_ghosting.py b/pype/plugins/maya/publish/validate_node_no_ghosting.py index 8f40628c616..a4b3122b345 100644 --- a/pype/plugins/maya/publish/validate_node_no_ghosting.py +++ b/pype/plugins/maya/publish/validate_node_no_ghosting.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateNodeNoGhosting(pyblish.api.InstancePlugin): @@ -21,7 +21,7 @@ class ValidateNodeNoGhosting(pyblish.api.InstancePlugin): hosts = ['maya'] families = ['model', 'rig'] label = "No Ghosting" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] _attributes = {'ghosting': 0} diff --git a/pype/plugins/maya/publish/validate_render_no_default_cameras.py b/pype/plugins/maya/publish/validate_render_no_default_cameras.py index 439cfb69d30..8c1fb42f1a9 100644 --- a/pype/plugins/maya/publish/validate_render_no_default_cameras.py +++ b/pype/plugins/maya/publish/validate_render_no_default_cameras.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin): @@ -12,7 +12,7 @@ class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin): hosts = ['maya'] families = ['renderlayer'] label = "No Default Cameras Renderable" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_render_single_camera.py b/pype/plugins/maya/publish/validate_render_single_camera.py index 51c5f64c860..482cf2fb59b 100644 --- a/pype/plugins/maya/publish/validate_render_single_camera.py +++ b/pype/plugins/maya/publish/validate_render_single_camera.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action from maya import cmds @@ -28,7 +28,7 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin): hosts = ['maya'] families = ["renderlayer", "vrayscene"] - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] R_CAMERA_TOKEN = re.compile(r'%c|', re.IGNORECASE) diff --git a/pype/plugins/maya/publish/validate_renderlayer_aovs.py b/pype/plugins/maya/publish/validate_renderlayer_aovs.py index 686a11e9068..aba8fdaa968 100644 --- a/pype/plugins/maya/publish/validate_renderlayer_aovs.py +++ b/pype/plugins/maya/publish/validate_renderlayer_aovs.py @@ -1,6 +1,6 @@ import pyblish.api -import pype.maya.action +import pype.hosts.maya.action from avalon import io import pype.api @@ -25,7 +25,7 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin): label = "Render Passes / AOVs Are Registered" hosts = ["maya"] families = ["renderlayer"] - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/pype/plugins/maya/publish/validate_rendersettings.py b/pype/plugins/maya/publish/validate_rendersettings.py index 67239d47908..16484affad6 100644 --- a/pype/plugins/maya/publish/validate_rendersettings.py +++ b/pype/plugins/maya/publish/validate_rendersettings.py @@ -6,7 +6,7 @@ import pyblish.api import pype.api -import pype.maya.lib as lib +from pype.hosts.maya import lib class ValidateRenderSettings(pyblish.api.InstancePlugin): diff --git a/pype/plugins/maya/publish/validate_rig_controllers.py b/pype/plugins/maya/publish/validate_rig_controllers.py index a9072e9d310..a1277281555 100644 --- a/pype/plugins/maya/publish/validate_rig_controllers.py +++ b/pype/plugins/maya/publish/validate_rig_controllers.py @@ -3,8 +3,8 @@ import pyblish.api import pype.api -import pype.maya.action -from pype.maya.lib import undo_chunk +import pype.hosts.maya.action +from pype.hosts.maya.lib import undo_chunk class ValidateRigControllers(pyblish.api.InstancePlugin): @@ -30,7 +30,7 @@ class ValidateRigControllers(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["rig"] actions = [pype.api.RepairAction, - pype.maya.action.SelectInvalidAction] + pype.hosts.maya.action.SelectInvalidAction] # Default controller values CONTROLLER_DEFAULTS = { diff --git a/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py b/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py index 525a15a4e53..8c1f8e4c7b1 100644 --- a/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py +++ b/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py @@ -3,8 +3,8 @@ import pyblish.api import pype.api -import pype.maya.lib as lib -import pype.maya.action +from pype.hosts.maya import lib +import pype.hosts.maya.action class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin): @@ -31,7 +31,7 @@ class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["rig"] actions = [pype.api.RepairAction, - pype.maya.action.SelectInvalidAction] + pype.hosts.maya.action.SelectInvalidAction] attributes = [ "rcurve", diff --git a/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py b/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py index 3dde6bc83d5..97dca803ee2 100644 --- a/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py +++ b/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py @@ -2,8 +2,8 @@ import pyblish.api import pype.api -import pype.maya.action -import pype.maya.lib as lib +import pype.hosts.maya.action +from pype.hosts.maya import lib class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin): @@ -20,7 +20,7 @@ class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin): families = ["rig"] hosts = ['maya'] label = 'Rig Out Set Node Ids' - actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction] + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_rig_output_ids.py b/pype/plugins/maya/publish/validate_rig_output_ids.py index 89cd37fe64b..fe9662d9d9f 100644 --- a/pype/plugins/maya/publish/validate_rig_output_ids.py +++ b/pype/plugins/maya/publish/validate_rig_output_ids.py @@ -3,8 +3,8 @@ import pyblish.api import pype.api -import pype.maya.action -from pype.maya.lib import undo_chunk +import pype.hosts.maya.action +from pype.hosts.maya.lib import undo_chunk class ValidateRigOutputIds(pyblish.api.InstancePlugin): @@ -19,7 +19,7 @@ class ValidateRigOutputIds(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["rig"] actions = [pype.api.RepairAction, - pype.maya.action.SelectInvalidAction] + pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): invalid = self.get_invalid(instance, compute=True) diff --git a/pype/plugins/maya/publish/validate_shader_name.py b/pype/plugins/maya/publish/validate_shader_name.py index c6f72a2940a..094ac0afe94 100644 --- a/pype/plugins/maya/publish/validate_shader_name.py +++ b/pype/plugins/maya/publish/validate_shader_name.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action import re @@ -18,7 +18,7 @@ class ValidateShaderName(pyblish.api.InstancePlugin): families = ["look"] hosts = ['maya'] label = 'Validate Shaders Name' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] regex = r'(?P.*)_(.*)_SHD' # The default connections to check diff --git a/pype/plugins/maya/publish/validate_shape_default_names.py b/pype/plugins/maya/publish/validate_shape_default_names.py index 9beb77872a5..c0638863da4 100644 --- a/pype/plugins/maya/publish/validate_shape_default_names.py +++ b/pype/plugins/maya/publish/validate_shape_default_names.py @@ -4,7 +4,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action def short_name(node): @@ -38,7 +38,7 @@ class ValidateShapeDefaultNames(pyblish.api.InstancePlugin): optional = True version = (0, 1, 0) label = "Shape Default Naming" - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] @staticmethod diff --git a/pype/plugins/maya/publish/validate_shape_render_stats.py b/pype/plugins/maya/publish/validate_shape_render_stats.py index b803cd366b7..af48d664ec3 100644 --- a/pype/plugins/maya/publish/validate_shape_render_stats.py +++ b/pype/plugins/maya/publish/validate_shape_render_stats.py @@ -3,7 +3,7 @@ from maya import cmds -import pype.maya.action +import pype.hosts.maya.action class ValidateShapeRenderStats(pyblish.api.Validator): @@ -13,7 +13,7 @@ class ValidateShapeRenderStats(pyblish.api.Validator): hosts = ['maya'] families = ['model'] label = 'Shape Default Render Stats' - actions = [pype.maya.action.SelectInvalidAction, + actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction] defaults = {'castsShadows': 1, diff --git a/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py b/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py index 71f7eea31bd..39870658adc 100644 --- a/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py +++ b/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin): @@ -18,7 +18,7 @@ class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin): hosts = ['maya'] families = ['fbx'] label = "Skincluster Deformer Relationships" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): """Process all the transform nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_step_size.py b/pype/plugins/maya/publish/validate_step_size.py index 20207a050f0..5e46e7df0be 100644 --- a/pype/plugins/maya/publish/validate_step_size.py +++ b/pype/plugins/maya/publish/validate_step_size.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateStepSize(pyblish.api.InstancePlugin): @@ -15,7 +15,7 @@ class ValidateStepSize(pyblish.api.InstancePlugin): families = ['camera', 'pointcache', 'animation'] - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] MIN = 0.01 MAX = 1.0 diff --git a/pype/plugins/maya/publish/validate_transform_naming_suffix.py b/pype/plugins/maya/publish/validate_transform_naming_suffix.py index e9ddd120b5c..bd7db437fa2 100644 --- a/pype/plugins/maya/publish/validate_transform_naming_suffix.py +++ b/pype/plugins/maya/publish/validate_transform_naming_suffix.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin): @@ -32,7 +32,7 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin): optional = True version = (0, 1, 0) label = 'Suffix Naming Conventions' - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] SUFFIX_NAMING_TABLE = {'mesh': ["_GEO", "_GES", "_GEP", "_OSD"], 'nurbsCurve': ["_CRV"], 'nurbsSurface': ["_NRB"], diff --git a/pype/plugins/maya/publish/validate_transform_zero.py b/pype/plugins/maya/publish/validate_transform_zero.py index 9b743164764..ac5517061f9 100644 --- a/pype/plugins/maya/publish/validate_transform_zero.py +++ b/pype/plugins/maya/publish/validate_transform_zero.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateTransformZero(pyblish.api.Validator): @@ -20,7 +20,7 @@ class ValidateTransformZero(pyblish.api.Validator): category = "geometry" version = (0, 1, 0) label = "Transform Zero (Freeze)" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] _identity = [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, diff --git a/pype/plugins/maya/publish/validate_unicode_strings.py b/pype/plugins/maya/publish/validate_unicode_strings.py index 9f229db062f..bf44d971af7 100644 --- a/pype/plugins/maya/publish/validate_unicode_strings.py +++ b/pype/plugins/maya/publish/validate_unicode_strings.py @@ -3,7 +3,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateUnicodeStrings(pyblish.api.Validator): diff --git a/pype/plugins/maya/publish/validate_unreal_mesh_triangulated.py b/pype/plugins/maya/publish/validate_unreal_mesh_triangulated.py index 77f7144c4e0..2cefe270195 100644 --- a/pype/plugins/maya/publish/validate_unreal_mesh_triangulated.py +++ b/pype/plugins/maya/publish/validate_unreal_mesh_triangulated.py @@ -13,7 +13,7 @@ class ValidateUnrealMeshTriangulated(pyblish.api.InstancePlugin): families = ["unrealStaticMesh"] category = "geometry" label = "Mesh is Triangulated" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_unreal_staticmesh_naming.py b/pype/plugins/maya/publish/validate_unreal_staticmesh_naming.py index b62a855da91..4116c5f5349 100644 --- a/pype/plugins/maya/publish/validate_unreal_staticmesh_naming.py +++ b/pype/plugins/maya/publish/validate_unreal_staticmesh_naming.py @@ -3,7 +3,7 @@ from maya import cmds import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action import re @@ -51,7 +51,7 @@ class ValidateUnrealStaticmeshName(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["unrealStaticMesh"] label = "Unreal StaticMesh Name" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] regex_mesh = r"SM_(?P.*)_(\d{2})" regex_collision = r"((UBX)|(UCP)|(USP)|(UCX))_(?P.*)_(\d{2})" diff --git a/pype/plugins/maya/publish/validate_vray_distributed_rendering.py b/pype/plugins/maya/publish/validate_vray_distributed_rendering.py index cccf966ffdf..6bec0c88dd1 100644 --- a/pype/plugins/maya/publish/validate_vray_distributed_rendering.py +++ b/pype/plugins/maya/publish/validate_vray_distributed_rendering.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api -import pype.maya.lib as lib +from pype.hosts.maya import lib from maya import cmds diff --git a/pype/plugins/maya/publish/validate_vrayproxy_members.py b/pype/plugins/maya/publish/validate_vrayproxy_members.py index 6631af43d90..75946a6787e 100644 --- a/pype/plugins/maya/publish/validate_vrayproxy_members.py +++ b/pype/plugins/maya/publish/validate_vrayproxy_members.py @@ -3,7 +3,7 @@ from maya import cmds -import pype.maya.action +import pype.hosts.maya.action class ValidateVrayProxyMembers(pyblish.api.InstancePlugin): @@ -13,7 +13,7 @@ class ValidateVrayProxyMembers(pyblish.api.InstancePlugin): label = 'VRay Proxy Members' hosts = ['maya'] families = ['vrayproxy'] - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_yeti_rig_cache_state.py b/pype/plugins/maya/publish/validate_yeti_rig_cache_state.py index 250c1c7b2e7..1ed145fecdc 100644 --- a/pype/plugins/maya/publish/validate_yeti_rig_cache_state.py +++ b/pype/plugins/maya/publish/validate_yeti_rig_cache_state.py @@ -1,7 +1,7 @@ import pyblish.api import pype.action import maya.cmds as cmds -import pype.maya.action +import pype.hosts.maya.action class ValidateYetiRigCacheState(pyblish.api.InstancePlugin): @@ -18,7 +18,7 @@ class ValidateYetiRigCacheState(pyblish.api.InstancePlugin): hosts = ["maya"] families = ["yetiRig"] actions = [pype.action.RepairAction, - pype.maya.action.SelectInvalidAction] + pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py b/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py index 51872d04e17..647a66cb57d 100644 --- a/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py +++ b/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py @@ -2,7 +2,7 @@ import pyblish.api import pype.api -import pype.maya.action +import pype.hosts.maya.action class ValidateYetiRigInputShapesInInstance(pyblish.api.Validator): @@ -12,7 +12,7 @@ class ValidateYetiRigInputShapesInInstance(pyblish.api.Validator): hosts = ["maya"] families = ["yetiRig"] label = "Yeti Rig Input Shapes In Instance" - actions = [pype.maya.action.SelectInvalidAction] + actions = [pype.hosts.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/nuke/create/create_write_prerender.py b/pype/plugins/nuke/create/create_write_prerender.py index b0bc36477f4..2243ba8b5c2 100644 --- a/pype/plugins/nuke/create/create_write_prerender.py +++ b/pype/plugins/nuke/create/create_write_prerender.py @@ -1,5 +1,5 @@ from collections import OrderedDict -from pype.nuke import ( +from pype.hosts.nuke import ( plugin, lib as pnlib) import nuke diff --git a/pype/plugins/nuke/create/create_write_render.py b/pype/plugins/nuke/create/create_write_render.py index 17eab02aeac..5a6bf571976 100644 --- a/pype/plugins/nuke/create/create_write_render.py +++ b/pype/plugins/nuke/create/create_write_render.py @@ -1,5 +1,5 @@ from collections import OrderedDict -from pype.nuke import ( +from pype.hosts.nuke import ( plugin, lib as pnlib) import nuke diff --git a/pype/plugins/nuke/load/actions.py b/pype/plugins/nuke/load/actions.py index a435633fd67..96f5f3b8c46 100644 --- a/pype/plugins/nuke/load/actions.py +++ b/pype/plugins/nuke/load/actions.py @@ -25,7 +25,7 @@ class SetFrameRangeLoader(api.Loader): def load(self, context, name, namespace, data): - from pype.nuke import lib + from pype.hosts.nuke import lib version = context['version'] version_data = version.get("data", {}) @@ -59,7 +59,7 @@ class SetFrameRangeWithHandlesLoader(api.Loader): def load(self, context, name, namespace, data): - from pype.nuke import lib + from pype.hosts.nuke import lib version = context['version'] version_data = version.get("data", {}) diff --git a/pype/plugins/nuke/load/load_backdrop.py b/pype/plugins/nuke/load/load_backdrop.py index 04cff311d19..66f9a8e1c12 100644 --- a/pype/plugins/nuke/load/load_backdrop.py +++ b/pype/plugins/nuke/load/load_backdrop.py @@ -1,7 +1,7 @@ from avalon import api, style, io import nuke import nukescripts -from pype.nuke import lib as pnlib +from pype.hosts.nuke import lib as pnlib from avalon.nuke import lib as anlib from avalon.nuke import containerise, update_container reload(pnlib) diff --git a/pype/plugins/nuke/load/load_gizmo_ip.py b/pype/plugins/nuke/load/load_gizmo_ip.py index 5fecbc4c5ce..e735e27bbf6 100644 --- a/pype/plugins/nuke/load/load_gizmo_ip.py +++ b/pype/plugins/nuke/load/load_gizmo_ip.py @@ -1,6 +1,6 @@ from avalon import api, style, io import nuke -from pype.nuke import lib as pnlib +from pype.hosts.nuke import lib as pnlib from avalon.nuke import lib as anlib from avalon.nuke import containerise, update_container diff --git a/pype/plugins/nuke/load/load_luts_ip.py b/pype/plugins/nuke/load/load_luts_ip.py index 41cc6c1a438..241e0776598 100644 --- a/pype/plugins/nuke/load/load_luts_ip.py +++ b/pype/plugins/nuke/load/load_luts_ip.py @@ -2,7 +2,7 @@ import nuke import json from collections import OrderedDict -from pype.nuke import lib +from pype.hosts.nuke import lib class LoadLutsInputProcess(api.Loader): diff --git a/pype/plugins/nuke/load/load_mov.py b/pype/plugins/nuke/load/load_mov.py index 5d15efcd3a7..d252aaa09d0 100644 --- a/pype/plugins/nuke/load/load_mov.py +++ b/pype/plugins/nuke/load/load_mov.py @@ -3,8 +3,8 @@ import contextlib from avalon import api, io -from pype.nuke import presets -from pypeapp import config +from pype.hosts.nuke import presets +from pype.api import config @contextlib.contextmanager diff --git a/pype/plugins/nuke/load/load_sequence.py b/pype/plugins/nuke/load/load_sequence.py index 1ee8f0481e1..aa79d8736a9 100644 --- a/pype/plugins/nuke/load/load_sequence.py +++ b/pype/plugins/nuke/load/load_sequence.py @@ -3,7 +3,7 @@ import contextlib from avalon import api, io -from pype.nuke import presets +from pype.hosts.nuke import presets @contextlib.contextmanager diff --git a/pype/plugins/nuke/publish/collect_backdrop.py b/pype/plugins/nuke/publish/collect_backdrop.py index 10729b217b6..5a117c29209 100644 --- a/pype/plugins/nuke/publish/collect_backdrop.py +++ b/pype/plugins/nuke/publish/collect_backdrop.py @@ -1,6 +1,6 @@ import pyblish.api import pype.api as pype -from pype.nuke import lib as pnlib +from pype.hosts.nuke import lib as pnlib import nuke @pyblish.api.log diff --git a/pype/plugins/nuke/publish/extract_backdrop.py b/pype/plugins/nuke/publish/extract_backdrop.py index 7b01b5deacc..0f7198887fc 100644 --- a/pype/plugins/nuke/publish/extract_backdrop.py +++ b/pype/plugins/nuke/publish/extract_backdrop.py @@ -1,6 +1,6 @@ import pyblish.api from avalon.nuke import lib as anlib -from pype.nuke import lib as pnlib +from pype.hosts.nuke import lib as pnlib import nuke import os import pype diff --git a/pype/plugins/nuke/publish/extract_gizmo.py b/pype/plugins/nuke/publish/extract_gizmo.py index 36ef1d464c9..465bf9824ca 100644 --- a/pype/plugins/nuke/publish/extract_gizmo.py +++ b/pype/plugins/nuke/publish/extract_gizmo.py @@ -1,7 +1,7 @@ import pyblish.api from avalon.nuke import lib as anlib -from pype.nuke import lib as pnlib -from pype.nuke import utils as pnutils +from pype.hosts.nuke import lib as pnlib +from pype.hosts.nuke import utils as pnutils import nuke import os import pype diff --git a/pype/plugins/nuke/publish/extract_review_data_lut.py b/pype/plugins/nuke/publish/extract_review_data_lut.py index 90b1fda1eca..10fe8fa2a91 100644 --- a/pype/plugins/nuke/publish/extract_review_data_lut.py +++ b/pype/plugins/nuke/publish/extract_review_data_lut.py @@ -1,7 +1,7 @@ import os import pyblish.api from avalon.nuke import lib as anlib -from pype.nuke import lib as pnlib +from pype.hosts.nuke import lib as pnlib import pype reload(pnlib) diff --git a/pype/plugins/nuke/publish/extract_review_data_mov.py b/pype/plugins/nuke/publish/extract_review_data_mov.py index 7c56dc8b92d..e9ac3c2c84d 100644 --- a/pype/plugins/nuke/publish/extract_review_data_mov.py +++ b/pype/plugins/nuke/publish/extract_review_data_mov.py @@ -1,7 +1,7 @@ import os import pyblish.api from avalon.nuke import lib as anlib -from pype.nuke import lib as pnlib +from pype.hosts.nuke import lib as pnlib import pype diff --git a/pype/plugins/nuke/publish/validate_write_deadline_tab.py b/pype/plugins/nuke/publish/validate_write_deadline_tab.py index 0510bdaebf8..e751a997713 100644 --- a/pype/plugins/nuke/publish/validate_write_deadline_tab.py +++ b/pype/plugins/nuke/publish/validate_write_deadline_tab.py @@ -1,5 +1,5 @@ import pyblish.api -import pype.nuke.lib +import pype.hosts.nuke.lib class RepairNukeWriteDeadlineTab(pyblish.api.Action): @@ -24,12 +24,12 @@ def process(self, context, plugin): group_node = [x for x in instance if x.Class() == "Group"][0] # Remove exising knobs. - knob_names = pype.nuke.lib.get_deadline_knob_names() + knob_names = pype.hosts.nuke.lib.get_deadline_knob_names() for name, knob in group_node.knobs().iteritems(): if name in knob_names: group_node.removeKnob(knob) - pype.nuke.lib.add_deadline_tab(group_node) + pype.hosts.nuke.lib.add_deadline_tab(group_node) class ValidateNukeWriteDeadlineTab(pyblish.api.InstancePlugin): @@ -45,7 +45,7 @@ class ValidateNukeWriteDeadlineTab(pyblish.api.InstancePlugin): def process(self, instance): group_node = [x for x in instance if x.Class() == "Group"][0] - knob_names = pype.nuke.lib.get_deadline_knob_names() + knob_names = pype.hosts.nuke.lib.get_deadline_knob_names() missing_knobs = [] for name in knob_names: if name not in group_node.knobs().keys(): diff --git a/pype/plugins/nuke/publish/validate_write_nodes.py b/pype/plugins/nuke/publish/validate_write_nodes.py index 836cee6c8fd..bd33194897e 100644 --- a/pype/plugins/nuke/publish/validate_write_nodes.py +++ b/pype/plugins/nuke/publish/validate_write_nodes.py @@ -1,7 +1,7 @@ import os import pyblish.api import pype.utils -import pype.nuke.lib as nukelib +import pype.hosts.nuke.lib as nukelib import avalon.nuke @pyblish.api.log diff --git a/pype/plugins/nukestudio/load/load_sequences_to_timeline_asset_origin.py b/pype/plugins/nukestudio/load/load_sequences_to_timeline_asset_origin.py index 2ee2409b863..c56dcbcaaac 100644 --- a/pype/plugins/nukestudio/load/load_sequences_to_timeline_asset_origin.py +++ b/pype/plugins/nukestudio/load/load_sequences_to_timeline_asset_origin.py @@ -1,6 +1,6 @@ from avalon import api import hiero -from pype.nukestudio import lib +from pype.hosts.nukestudio import lib reload(lib) diff --git a/pype/plugins/standalonepublisher/publish/collect_context.py b/pype/plugins/standalonepublisher/publish/collect_context.py index 0567f82755d..8bd4e609ab5 100644 --- a/pype/plugins/standalonepublisher/publish/collect_context.py +++ b/pype/plugins/standalonepublisher/publish/collect_context.py @@ -52,7 +52,7 @@ def process(self, context): # Load presets presets = context.data.get("presets") if not presets: - from pypeapp import config + from pype.api import config presets = config.get_presets() diff --git a/pype/plugins/unreal/create/create_staticmeshfbx.py b/pype/plugins/unreal/create/create_staticmeshfbx.py index 8002299f0ac..fa41590ef55 100644 --- a/pype/plugins/unreal/create/create_staticmeshfbx.py +++ b/pype/plugins/unreal/create/create_staticmeshfbx.py @@ -1,5 +1,5 @@ import unreal -from pype.unreal.plugin import Creator +from pype.hosts.unreal.plugin import Creator from avalon.unreal import ( instantiate, ) diff --git a/pype/scripts/fusion_switch_shot.py b/pype/scripts/fusion_switch_shot.py index 539bcf4f685..f936b7d8e0a 100644 --- a/pype/scripts/fusion_switch_shot.py +++ b/pype/scripts/fusion_switch_shot.py @@ -9,7 +9,7 @@ # Config imports import pype.lib as pype -import pype.fusion.lib as fusion_lib +import pype.hosts.fusion.lib as fusion_lib log = logging.getLogger("Update Slap Comp") diff --git a/pype/scripts/otio_burnin.py b/pype/scripts/otio_burnin.py index 138165d4894..104ff0255c2 100644 --- a/pype/scripts/otio_burnin.py +++ b/pype/scripts/otio_burnin.py @@ -4,8 +4,7 @@ import subprocess import json import opentimelineio_contrib.adapters.ffmpeg_burnins as ffmpeg_burnins -from pypeapp.lib import config -from pypeapp import Logger +from pype.api import Logger, config import pype.lib log = Logger().get_logger("BurninWrapper", "burninwrap") diff --git a/pype/scripts/slates/slate_base/lib.py b/pype/scripts/slates/slate_base/lib.py index d9f8ad6d42b..6b0c01883c5 100644 --- a/pype/scripts/slates/slate_base/lib.py +++ b/pype/scripts/slates/slate_base/lib.py @@ -13,7 +13,7 @@ ) try: - from pypeapp.config import get_presets + from pype.api.config import get_presets except Exception: get_presets = dict diff --git a/pype/setdress_api.py b/pype/setdress_api.py index 707a5b713fe..7c764a42df3 100644 --- a/pype/setdress_api.py +++ b/pype/setdress_api.py @@ -9,7 +9,7 @@ from avalon import api, io from avalon.maya.lib import unique_namespace -from pype.maya.lib import matrix_equals +from pype.hosts.maya.lib import matrix_equals log = logging.getLogger("PackageLoader") @@ -161,7 +161,7 @@ def _add(instance, representation_id, loaders, namespace, root="|"): """ - from pype.maya.lib import get_container_transforms + from pype.hosts.maya.lib import get_container_transforms # Process within the namespace with namespaced(namespace, new=False) as namespace: @@ -358,7 +358,7 @@ def update_scene(set_container, containers, current_data, new_data, new_file): """ - from pype.maya.lib import DEFAULT_MATRIX, get_container_transforms + from pype.hosts.maya.lib import DEFAULT_MATRIX, get_container_transforms set_namespace = set_container['namespace'] diff --git a/pype/tools/assetcreator/app.py b/pype/tools/assetcreator/app.py index 5f9ff80de61..71b1027ef49 100644 --- a/pype/tools/assetcreator/app.py +++ b/pype/tools/assetcreator/app.py @@ -6,7 +6,7 @@ import ftrack_api_old as ftrack_api except Exception: import ftrack_api -from pypeapp import config +from pype.api import config from pype import lib as pypelib from avalon.vendor.Qt import QtWidgets, QtCore from avalon import io, api, style, schema diff --git a/pype/tools/texture_copy/app.py b/pype/tools/texture_copy/app.py index 5f89db53ff5..cda7b5a4431 100644 --- a/pype/tools/texture_copy/app.py +++ b/pype/tools/texture_copy/app.py @@ -5,7 +5,7 @@ from pprint import pprint from pypeapp.lib.Terminal import Terminal -from pypeapp import Anatomy +from pype.api import Anatomy import shutil import speedcopy diff --git a/setup/blender/init.py b/setup/blender/init.py index 05c15eaeb28..8aa83e51c9d 100644 --- a/setup/blender/init.py +++ b/setup/blender/init.py @@ -1,3 +1,3 @@ -from pype import blender +from pype.hosts import blender blender.install() diff --git a/setup/maya/userSetup.py b/setup/maya/userSetup.py index 4f4aed36b70..bbf66846da0 100644 --- a/setup/maya/userSetup.py +++ b/setup/maya/userSetup.py @@ -1,6 +1,6 @@ import os -from pypeapp import config -import pype.maya.lib as mlib +from pype.api import config +import pype.hosts.maya.lib as mlib from maya import cmds diff --git a/setup/nuke/nuke_path/menu.py b/setup/nuke/nuke_path/menu.py index be4f39b5421..d9341045a93 100644 --- a/setup/nuke/nuke_path/menu.py +++ b/setup/nuke/nuke_path/menu.py @@ -2,14 +2,14 @@ import sys import KnobScripter -from pype.nuke.lib import ( +from pype.hosts.nuke.lib import ( writes_version_sync, on_script_load, check_inventory_versions ) import nuke -from pypeapp import Logger +from pype.api import Logger log = Logger().get_logger(__name__, "nuke") diff --git a/setup/nuke/nuke_path/write_to_read.py b/setup/nuke/nuke_path/write_to_read.py index 2cf6598b3be..7ea9220ad80 100644 --- a/setup/nuke/nuke_path/write_to_read.py +++ b/setup/nuke/nuke_path/write_to_read.py @@ -2,8 +2,8 @@ import os import glob import nuke -from pype import api as pype -log = pype.Logger().get_logger(__name__, "nuke") +from pype.api import Logger +log = Logger().get_logger(__name__, "nuke") SINGLE_FILE_FORMATS = ['avi', 'mp4', 'mxf', 'mov', 'mpg', 'mpeg', 'wmv', 'm4v', 'm2v'] @@ -122,7 +122,7 @@ def write_to_read(gn): ) if not file_path_new: return - + myfiletranslated, firstFrame, lastFrame = file_path_new # get node data ndata = { diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py b/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py index bbef6502a9f..e5c5729e2c2 100644 --- a/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py +++ b/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py @@ -2,11 +2,11 @@ # activate nukestudio from pype import avalon.api -import pype.nukestudio -avalon.api.install(pype.nukestudio) +import pype.hosts.nukestudio +avalon.api.install(pype.hosts.nukestudio) try: - __import__("pype.nukestudio") + __import__("pype.hosts.nukestudio") __import__("pyblish") except ImportError as e: @@ -15,5 +15,5 @@ else: # Setup integration - import pype.nukestudio.lib - pype.nukestudio.lib.setup() + import pype.hosts.nukestudio.lib + pype.hosts.nukestudio.lib.setup()