From 27353d4b099a66e8ff699e33d51383c0d7bd45db Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Jun 2017 17:10:53 +0200 Subject: [PATCH] Swap pyblish_maya dependency to avalon.maya --- colorbleed/plugins/maya/publish/__extract_layout.py | 4 ++-- colorbleed/plugins/maya/publish/extract_alembic.py | 4 ++-- colorbleed/plugins/maya/publish/extract_camera_baked.py | 6 +++--- colorbleed/plugins/maya/publish/extract_camera_raw.py | 4 ++-- colorbleed/plugins/maya/publish/extract_instancer.py | 4 ++-- colorbleed/plugins/maya/publish/extract_layout_mayaAscii.py | 4 ++-- colorbleed/plugins/maya/publish/extract_look.py | 4 ++-- colorbleed/plugins/maya/publish/extract_maya_ascii.py | 4 ++-- colorbleed/plugins/maya/publish/extract_maya_ascii_raw.py | 4 ++-- colorbleed/plugins/maya/publish/extract_model.py | 4 ++-- colorbleed/plugins/maya/publish/extract_particles.py | 4 ++-- colorbleed/plugins/maya/publish/extract_yeti_nodes.py | 4 ++-- colorbleed/plugins/maya/publish/validate_layout_content.py | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/colorbleed/plugins/maya/publish/__extract_layout.py b/colorbleed/plugins/maya/publish/__extract_layout.py index a589dc05ae..823337b2e1 100644 --- a/colorbleed/plugins/maya/publish/__extract_layout.py +++ b/colorbleed/plugins/maya/publish/__extract_layout.py @@ -2,7 +2,7 @@ import json from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api import cb.utils.maya.context as context @@ -57,7 +57,7 @@ class ExtractLayout(colorbleed.api.Extractor): # Perform extraction self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): # Get children hierarchy nodes = instance.data['setMembers'] diff --git a/colorbleed/plugins/maya/publish/extract_alembic.py b/colorbleed/plugins/maya/publish/extract_alembic.py index 55b8fa2619..9236082268 100644 --- a/colorbleed/plugins/maya/publish/extract_alembic.py +++ b/colorbleed/plugins/maya/publish/extract_alembic.py @@ -4,7 +4,7 @@ import contextlib from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api @@ -160,7 +160,7 @@ class ExtractAlembic(colorbleed.api.Extractor): os.makedirs(parent_dir) with suspension(): - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): self.log.debug( "Preparing %s for export using the following options: %s\n" "and the following string: %s" diff --git a/colorbleed/plugins/maya/publish/extract_camera_baked.py b/colorbleed/plugins/maya/publish/extract_camera_baked.py index 89db766631..6e93beb082 100644 --- a/colorbleed/plugins/maya/publish/extract_camera_baked.py +++ b/colorbleed/plugins/maya/publish/extract_camera_baked.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api import cb.utils.maya.context as context @@ -83,7 +83,7 @@ class ExtractCameraBaked(colorbleed.api.Extractor): path = os.path.join(dir_path, filename) self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(baked_shapes, noExpand=True) cmds.file(path, force=True, @@ -116,7 +116,7 @@ class ExtractCameraBaked(colorbleed.api.Extractor): # we *do not* publish a baked camera we want to keep it enabled. This # way what the artist has in the scene visually represents the output. with context.timewarp(state=not alembic_as_baked): - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(abc_shapes, replace=True, noExpand=True) # Enforce forward slashes for AbcExport because we're diff --git a/colorbleed/plugins/maya/publish/extract_camera_raw.py b/colorbleed/plugins/maya/publish/extract_camera_raw.py index 43c74a8471..18636ae39c 100644 --- a/colorbleed/plugins/maya/publish/extract_camera_raw.py +++ b/colorbleed/plugins/maya/publish/extract_camera_raw.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api @@ -30,7 +30,7 @@ class ExtractCameraRaw(colorbleed.api.Extractor): # Perform extraction self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(cameras, noExpand=True) cmds.file(path, force=True, diff --git a/colorbleed/plugins/maya/publish/extract_instancer.py b/colorbleed/plugins/maya/publish/extract_instancer.py index 3d76cff89c..98523e0555 100644 --- a/colorbleed/plugins/maya/publish/extract_instancer.py +++ b/colorbleed/plugins/maya/publish/extract_instancer.py @@ -3,7 +3,7 @@ import contextlib import maya.cmds as cmds -import pyblish_maya +import avalon.maya import colorbleed.api import cb.utils.maya.context as context @@ -125,7 +125,7 @@ class ExtractInstancerMayaAscii(colorbleed.api.Extractor): # Perform extraction self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): with cache_file_paths(cache_remap): with context.attribute_values(attr_remap): cmds.select(export, noExpand=True) diff --git a/colorbleed/plugins/maya/publish/extract_layout_mayaAscii.py b/colorbleed/plugins/maya/publish/extract_layout_mayaAscii.py index 17a9f894c9..1128780186 100644 --- a/colorbleed/plugins/maya/publish/extract_layout_mayaAscii.py +++ b/colorbleed/plugins/maya/publish/extract_layout_mayaAscii.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api @@ -22,7 +22,7 @@ class ExtractLayoutMayaAscii(colorbleed.api.Extractor): # Perform extraction self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(instance, noExpand=True) cmds.file(path, force=True, diff --git a/colorbleed/plugins/maya/publish/extract_look.py b/colorbleed/plugins/maya/publish/extract_look.py index a0b9b3daf0..95eaf3c2b2 100644 --- a/colorbleed/plugins/maya/publish/extract_look.py +++ b/colorbleed/plugins/maya/publish/extract_look.py @@ -3,7 +3,7 @@ import json from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api import cb.utils.maya.context as context @@ -56,7 +56,7 @@ class ExtractLook(colorbleed.api.Extractor): # TODO: Ensure membership edits don't become renderlayer overrides with context.empty_sets(sets): with context.attribute_values(resource_remap): - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(sets, noExpand=True) cmds.file(maya_path, force=True, diff --git a/colorbleed/plugins/maya/publish/extract_maya_ascii.py b/colorbleed/plugins/maya/publish/extract_maya_ascii.py index 7b5bc09383..e0129a3614 100644 --- a/colorbleed/plugins/maya/publish/extract_maya_ascii.py +++ b/colorbleed/plugins/maya/publish/extract_maya_ascii.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api @@ -23,7 +23,7 @@ class ExtractMayaAscii(colorbleed.api.Extractor): # Perform extraction self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(instance, noExpand=True) cmds.file(path, force=True, diff --git a/colorbleed/plugins/maya/publish/extract_maya_ascii_raw.py b/colorbleed/plugins/maya/publish/extract_maya_ascii_raw.py index 7f52388581..528520a0f9 100644 --- a/colorbleed/plugins/maya/publish/extract_maya_ascii_raw.py +++ b/colorbleed/plugins/maya/publish/extract_maya_ascii_raw.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api @@ -37,7 +37,7 @@ class ExtractMayaAsciiRaw(colorbleed.api.Extractor): # Perform extraction self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(members, noExpand=True) cmds.file(path, force=True, diff --git a/colorbleed/plugins/maya/publish/extract_model.py b/colorbleed/plugins/maya/publish/extract_model.py index 19b55e03a1..de9dcfa6f1 100644 --- a/colorbleed/plugins/maya/publish/extract_model.py +++ b/colorbleed/plugins/maya/publish/extract_model.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api from cb.utils.maya import context @@ -57,7 +57,7 @@ class ExtractModel(colorbleed.api.Extractor): polygonObject=1): with context.shader(members, shadingEngine="initialShadingGroup"): - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(members, noExpand=True) cmds.file(path, force=True, diff --git a/colorbleed/plugins/maya/publish/extract_particles.py b/colorbleed/plugins/maya/publish/extract_particles.py index d47e2c9a9b..96cb71a2de 100644 --- a/colorbleed/plugins/maya/publish/extract_particles.py +++ b/colorbleed/plugins/maya/publish/extract_particles.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api @@ -26,7 +26,7 @@ class ExtractParticlesMayaAscii(colorbleed.api.Extractor): # Perform extraction self.log.info("Performing extraction..") - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): cmds.select(export, noExpand=True) cmds.file(path, force=True, diff --git a/colorbleed/plugins/maya/publish/extract_yeti_nodes.py b/colorbleed/plugins/maya/publish/extract_yeti_nodes.py index d380f0b86b..90281e4636 100644 --- a/colorbleed/plugins/maya/publish/extract_yeti_nodes.py +++ b/colorbleed/plugins/maya/publish/extract_yeti_nodes.py @@ -2,7 +2,7 @@ import os from maya import cmds -import pyblish_maya +import avalon.maya import colorbleed.api import cb.utils.maya.context as context @@ -47,7 +47,7 @@ class ExtractFurYeti(colorbleed.api.Extractor): resource_remap[attribute] = destination # Perform extraction - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): with context.attribute_values(resource_remap): cmds.select(members, r=True, noExpand=True) cmds.file(path, diff --git a/colorbleed/plugins/maya/publish/validate_layout_content.py b/colorbleed/plugins/maya/publish/validate_layout_content.py index dd4f1e8c3d..1c21331d37 100644 --- a/colorbleed/plugins/maya/publish/validate_layout_content.py +++ b/colorbleed/plugins/maya/publish/validate_layout_content.py @@ -1,7 +1,7 @@ import pyblish.api import maya.cmds as cmds import colorbleed.api -import pyblish_maya +import avalon.maya import cb.utils.maya.dag as dag @@ -35,7 +35,7 @@ class ValidateLayoutContent(pyblish.api.InstancePlugin): "{0}".format(instance)) # Ensure at least any extract nodes readily available after filtering - with pyblish_maya.maintained_selection(): + with avalon.maya.maintained_selection(): import cbra.utils.maya.layout as layout