fixed conflicts

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):

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
 

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):

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):

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):

pype/plugins/maya/create/create_render.py

@@ -8,7 +8,7 @@ import requests
 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
 
 

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 @@ class CreateRenderSetup(avalon.maya.Creator):
         #    \__|     |
         #       \_____/
 
-        # 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"]

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):

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
 
 

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):

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
 
 

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",

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"]

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)
 
 

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 @@ class LookLoader(pype.maya.plugin.ReferenceLoader):
         # 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),

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",

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(

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"""

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
 
 

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"]

pype/plugins/maya/load/load_yeti_cache.py

@@ -8,8 +8,8 @@ from maya import cmds
 
 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
 
 

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

pype/plugins/maya/publish/collect_assembly.py

@@ -3,7 +3,7 @@ import pyblish.api
 
 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!
 

pype/plugins/maya/publish/collect_file_dependencies.py

@@ -0,0 +1,28 @@
+import json
+
+from maya import cmds
+
+import pyblish.api
+
+
+class CollectFileDependencies(pyblish.api.ContextPlugin):
+    """Gather all files referenced in this scene."""
+
+    label = "Collect File Dependencies"
+    order = pyblish.api.CollectorOrder - 0.49
+    hosts = ["maya"]
+
+    def process(self, context):
+        dependencies = []
+        for node in cmds.ls(type="file"):
+            path = cmds.getAttr("{}.{}".format(node, "fileTextureName"))
+            if path not in dependencies:
+                dependencies.append(path)
+
+        for node in cmds.ls(type="AlembicNode"):
+            path = cmds.getAttr("{}.{}".format(node, "abc_File"))
+            if path not in dependencies:
+                dependencies.append(path)
+
+        context.data["fileDependencies"] = dependencies
+        self.log.debug(json.dumps(dependencies, indent=4))

pype/plugins/maya/publish/collect_look.py

@@ -4,7 +4,7 @@ import glob
 
 from maya import cmds
 import pyblish.api
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 
 SHAPE_ATTRS = ["castsShadows",
                "receiveShadows",

pype/plugins/maya/publish/collect_render.py

@@ -49,8 +49,8 @@ import maya.app.renderSetup.model.renderSetup as renderSetup
 import pyblish.api
 
 from avalon import maya, api
-import pype.maya.lib as lib
-from pype.maya.expected_files import ExpectedFiles
+from pype.hosts.maya.expected_files import ExpectedFiles
+from pype.hosts.maya import lib
 
 
 class CollectMayaRender(pyblish.api.ContextPlugin):
@@ -87,7 +87,9 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
 
         self._rs = renderSetup.instance()
         current_layer = self._rs.getVisibleRenderLayer()
-        maya_render_layers = {l.name(): l for l in self._rs.getRenderLayers()}
+        maya_render_layers = {
+            layer.name(): layer for layer in self._rs.getRenderLayers()
+        }
 
         self.maya_layers = maya_render_layers
 

pype/plugins/maya/publish/collect_render_layer_aovs.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 
 
 class CollectRenderLayerAOVS(pyblish.api.InstancePlugin):

pype/plugins/maya/publish/collect_renderable_camera.py

@@ -2,7 +2,7 @@ import pyblish.api
 
 from maya import cmds
 
-from pype.maya import lib
+from pype.hosts.maya import lib
 
 
 class CollectRenderableCamera(pyblish.api.InstancePlugin):

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):

pype/plugins/maya/publish/collect_yeti_cache.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-from pype.maya import lib
+from pype.hosts.maya import lib
 
 SETTINGS = {"renderDensity",
             "renderWidth",

pype/plugins/maya/publish/collect_yeti_rig.py

@@ -5,7 +5,7 @@ from maya import cmds
 
 import pyblish.api
 
-from pype.maya import lib
+from pype.hosts.maya import lib
 from pype.lib import pairwise
 
 

pype/plugins/maya/publish/extract_animation.py

@@ -4,7 +4,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/extract_assembly.py

@@ -3,7 +3,7 @@ import json
 import os
 
 import pype.api
-from pype.maya.lib import extract_alembic
+from pype.hosts.maya.lib import extract_alembic
 
 from maya import cmds
 

pype/plugins/maya/publish/extract_assproxy.py

@@ -5,7 +5,7 @@ import contextlib
 
 import avalon.maya
 import pype.api
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 
 
 class ExtractAssProxy(pype.api.Extractor):

pype/plugins/maya/publish/extract_camera_alembic.py

@@ -5,7 +5,7 @@ from maya import cmds
 import avalon.maya
 import pype.api
 
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 
 
 class ExtractCameraAlembic(pype.api.Extractor):

pype/plugins/maya/publish/extract_camera_mayaAscii.py

@@ -5,7 +5,7 @@ from maya import cmds
 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):

pype/plugins/maya/publish/extract_look.py

@@ -14,7 +14,7 @@ import avalon.maya
 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

pype/plugins/maya/publish/extract_model.py

@@ -4,7 +4,7 @@ from maya import cmds
 
 import avalon.maya
 import pype.api
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 
 
 class ExtractModel(pype.api.Extractor):

pype/plugins/maya/publish/extract_playblast.py

@@ -4,7 +4,7 @@ import contextlib
 import clique
 import capture
 
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 import pype.api
 
 from maya import cmds

pype/plugins/maya/publish/extract_pointcache.py

@@ -4,7 +4,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/extract_thumbnail.py

@@ -4,7 +4,7 @@ import glob
 
 import capture
 
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 import pype.api
 
 from maya import cmds

pype/plugins/maya/publish/extract_yeti_rig.py

@@ -6,7 +6,7 @@ from maya import cmds
 
 import avalon.maya.lib as lib
 import pype.api
-import pype.maya.lib as maya
+import pype.hosts.maya.lib as maya
 
 
 @contextlib.contextmanager

pype/plugins/maya/publish/submit_maya_deadline.py

@@ -28,7 +28,8 @@ from maya import cmds
 
 from avalon import api
 import pyblish.api
-import pype.maya.lib as lib
+
+from pype.hosts.maya import lib
 
 # Documentation for keys available at:
 # https://docs.thinkboxsoftware.com
@@ -290,6 +291,15 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         payload_skeleton["JobInfo"]["Comment"] = comment
         payload_skeleton["PluginInfo"]["RenderLayer"] = renderlayer
 
+        # Adding file dependencies.
+        dependencies = instance.context.data["fileDependencies"]
+        dependencies.append(filepath)
+        for dependency in dependencies:
+            self.log.info(dependency)
+            key = "AssetDependency" + str(dependencies.index(dependency))
+            self.log.info(key)
+            payload_skeleton["JobInfo"][key] = dependency
+
         # Handle environments -----------------------------------------------
         # We need those to pass them to pype for it to set correct context
         keys = [

pype/plugins/maya/publish/submit_maya_muster.py

@@ -10,8 +10,8 @@ from avalon import api
 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

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):

pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py

@@ -2,8 +2,8 @@ import maya.cmds as cmds
 
 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"""

pype/plugins/maya/publish/validate_ass_relative_paths.py

@@ -5,7 +5,7 @@ import maya.cmds as cmds
 
 import pyblish.api
 import pype.api
-import pype.maya.action
+import pype.hosts.maya.action
 
 
 class ValidateAssRelativePaths(pyblish.api.InstancePlugin):

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

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):
 

pype/plugins/maya/publish/validate_assembly_transforms.py

@@ -3,7 +3,7 @@ import pype.api
 
 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 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
     @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 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
 
         """
 
-        import pype.maya.lib as lib
+        from pype.hosts.maya import lib
         from avalon.vendor.Qt import QtWidgets
 
         # Store namespace in variable, cosmetics thingy

pype/plugins/maya/publish/validate_camera_attributes.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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),

pype/plugins/maya/publish/validate_camera_contents.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_color_sets.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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
 

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):

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):

pype/plugins/maya/publish/validate_joints_hidden.py

@@ -2,8 +2,8 @@ from maya import cmds
 
 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

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"""

pype/plugins/maya/publish/validate_look_id_reference_edits.py

@@ -3,7 +3,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_look_members_unique.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 
 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"""

pype/plugins/maya/publish/validate_look_no_default_shaders.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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"}

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"""

pype/plugins/maya/publish/validate_look_shading_group.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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

pype/plugins/maya/publish/validate_look_single_shader.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_maya_units.py

@@ -3,7 +3,7 @@ import maya.cmds as cmds
 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
 
 

pype/plugins/maya/publish/validate_mesh_arnold_attributes.py

@@ -2,7 +2,7 @@ import pymel.core as pc
 
 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

pype/plugins/maya/publish/validate_mesh_has_uv.py

@@ -4,7 +4,7 @@ from maya import cmds
 
 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

pype/plugins/maya/publish/validate_mesh_lamina_faces.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_mesh_no_negative_scale.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_mesh_non_manifold.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_mesh_non_zero_edge.py

@@ -2,8 +2,8 @@ from maya import cmds
 
 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

pype/plugins/maya/publish/validate_mesh_normals_unlocked.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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
 

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

pype/plugins/maya/publish/validate_mesh_shader_connections.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_mesh_single_uv_set.py

@@ -2,8 +2,8 @@ from maya import cmds
 
 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

pype/plugins/maya/publish/validate_mesh_uv_set_map1.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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

pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py

@@ -4,7 +4,7 @@ from maya import cmds
 
 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

pype/plugins/maya/publish/validate_model_content.py

@@ -2,8 +2,8 @@ from maya import cmds
 
 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):

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

pype/plugins/maya/publish/validate_muster_connection.py

@@ -5,7 +5,7 @@ import appdirs
 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):

pype/plugins/maya/publish/validate_no_animation.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):
 

pype/plugins/maya/publish/validate_no_default_camera.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_no_namespace.py

@@ -3,7 +3,7 @@ import maya.cmds as cmds
 
 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

pype/plugins/maya/publish/validate_no_null_transforms.py

@@ -2,7 +2,7 @@ import maya.cmds as cmds
 
 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):

pype/plugins/maya/publish/validate_no_unknown_nodes.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

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"""

pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py

@@ -2,8 +2,8 @@ from maya import cmds
 
 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"""

pype/plugins/maya/publish/validate_node_ids_in_database.py

@@ -3,8 +3,8 @@ import pyblish.api
 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)

pype/plugins/maya/publish/validate_node_ids_related.py

@@ -2,9 +2,9 @@ import pyblish.api
 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)"""

pype/plugins/maya/publish/validate_node_ids_unique.py

@@ -2,8 +2,8 @@ from collections import defaultdict
 
 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"""

pype/plugins/maya/publish/validate_node_no_ghosting.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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}
 

pype/plugins/maya/publish/validate_render_no_default_cameras.py

@@ -2,7 +2,7 @@ from maya import cmds
 
 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):

pype/plugins/maya/publish/validate_render_single_camera.py

@@ -2,7 +2,7 @@ import re
 
 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|<camera>', re.IGNORECASE)
 

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)

pype/plugins/maya/publish/validate_rendersettings.py

@@ -6,7 +6,7 @@ import pymel.core as pm
 
 import pyblish.api
 import pype.api
-import pype.maya.lib as lib
+from pype.hosts.maya import lib
 
 
 class ValidateRenderSettings(pyblish.api.InstancePlugin):

pype/plugins/maya/publish/validate_rig_controllers.py

@@ -3,8 +3,8 @@ from maya import cmds
 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 = {

pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py

@@ -3,8 +3,8 @@ from maya import cmds
 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",

pype/plugins/maya/publish/validate_rig_out_set_node_ids.py

@@ -2,8 +2,8 @@ import maya.cmds as cmds
 
 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"""

pype/plugins/maya/publish/validate_rig_output_ids.py

@@ -3,8 +3,8 @@ import pymel.core as pc
 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)

pype/plugins/maya/publish/validate_shader_name.py

@@ -2,7 +2,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 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<asset>.*)_(.*)_SHD'
 
     # The default connections to check

pype/plugins/maya/publish/validate_shape_default_names.py

@@ -4,7 +4,7 @@ from maya import cmds
 
 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