Merge pull request #1068 from pypeclub/feature/656-optionally-add-tas…

…k-to-subset-name

Optionally add task to subset name

pype/api.py

@@ -44,6 +44,9 @@
 from . import resources
 
 from .plugin import (
+ PypeCreatorMixin,
+ Creator,
+
  Extractor,
 
  ValidatePipelineOrder,
@@ -86,6 +89,9 @@
  # Resources
  "resources",
 
+ # Pype creator mixin
+ "PypeCreatorMixin",
+ "Creator",
  # plugin classes
  "Extractor",
  # ordering

pype/hosts/aftereffects/plugins/create/create_render.py

@@ -1,4 +1,4 @@
-from avalon import api
+import pype.api
 from avalon.vendor import Qt
 from avalon import aftereffects
 
@@ -7,7 +7,7 @@
 log = logging.getLogger(__name__)
 
 
-class CreateRender(api.Creator):
+class CreateRender(pype.api.Creator):
  """Render folder for publish."""
 
  name = "renderDefault"

pype/hosts/blender/api/plugin.py

@@ -6,6 +6,8 @@
 import bpy
 
 from avalon import api
+import avalon.blender
+from pype.api import PypeCreatorMixin
 
 VALID_EXTENSIONS = [".blend", ".json"]
 
@@ -100,6 +102,10 @@ def get_local_collection_with_name(name):
  return None
 
 
+class Creator(PypeCreatorMixin, avalon.blender.Creator):
+ pass
+
+
 class AssetLoader(api.Loader):
  """A basic AssetLoader for Blender
 

pype/hosts/blender/plugins/create/create_action.py

@@ -3,11 +3,11 @@
 import bpy
 
 from avalon import api
-from avalon.blender import Creator, lib
 import pype.hosts.blender.api.plugin
+from avalon.blender import lib
 
 
-class CreateAction(Creator):
+class CreateAction(pype.hosts.blender.api.plugin.Creator):
  """Action output for character rigs"""
 
  name = "actionMain"

pype/hosts/blender/plugins/create/create_animation.py

@@ -6,7 +6,7 @@
 import pype.hosts.blender.api.plugin
 
 
-class CreateAnimation(blender.Creator):
+class CreateAnimation(pype.hosts.blender.api.plugin.Creator):
  """Animation output for character rigs"""
 
  name = "animationMain"

pype/hosts/blender/plugins/create/create_camera.py

@@ -3,11 +3,11 @@
 import bpy
 
 from avalon import api
-from avalon.blender import Creator, lib
+from avalon.blender import lib
 import pype.hosts.blender.api.plugin
 
 
-class CreateCamera(Creator):
+class CreateCamera(pype.hosts.blender.api.plugin.Creator):
  """Polygonal static geometry"""
 
  name = "cameraMain"

pype/hosts/blender/plugins/create/create_layout.py

@@ -3,11 +3,11 @@
 import bpy
 
 from avalon import api
-from avalon.blender import Creator, lib
+from avalon.blender import lib
 import pype.hosts.blender.api.plugin
 
 
-class CreateLayout(Creator):
+class CreateLayout(pype.hosts.blender.api.plugin.Creator):
  """Layout output for character rigs"""
 
  name = "layoutMain"

pype/hosts/blender/plugins/create/create_model.py

@@ -3,11 +3,11 @@
 import bpy
 
 from avalon import api
-from avalon.blender import Creator, lib
+from avalon.blender import lib
 import pype.hosts.blender.api.plugin
 
 
-class CreateModel(Creator):
+class CreateModel(pype.hosts.blender.api.plugin.Creator):
  """Polygonal static geometry"""
 
  name = "modelMain"

pype/hosts/blender/plugins/create/create_rig.py

@@ -3,11 +3,11 @@
 import bpy
 
 from avalon import api
-from avalon.blender import Creator, lib
+from avalon.blender import lib
 import pype.hosts.blender.api.plugin
 
 
-class CreateRig(Creator):
+class CreateRig(pype.hosts.blender.api.plugin.Creator):
  """Artist-friendly rig with controls to direct motion"""
 
  name = "rigMain"

pype/hosts/blender/plugins/create/create_setdress.py

@@ -3,7 +3,8 @@
 from avalon import api, blender
 import pype.hosts.blender.api.plugin
 
-class CreateSetDress(blender.Creator):
+
+class CreateSetDress(pype.hosts.blender.api.plugin.Creator):
  """A grouped package of loaded content"""
 
  name = "setdressMain"

pype/hosts/fusion/plugins/create/create_exr_saver.py

@@ -1,10 +1,10 @@
 import os
 
-import avalon.api
+import pype.api
 from avalon import fusion
 
 
-class CreateOpenEXRSaver(avalon.api.Creator):
+class CreateOpenEXRSaver(pype.api.Creator):
 
  name = "openexrDefault"
  label = "Create OpenEXR Saver"

pype/hosts/harmony/api/plugin.py

@@ -0,0 +1,6 @@
+from avalon import harmony
+from pype.api import PypeCreatorMixin
+
+
+class Creator(PypeCreatorMixin, harmony.Creator):
+ pass

pype/hosts/harmony/plugins/create/create_farm_render.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 """Create Composite node for render on farm."""
 from avalon import harmony
+from pype.hosts.harmony.api import plugin
 
 
-class CreateFarmRender(harmony.Creator):
+class CreateFarmRender(plugin.Creator):
  """Composite node for publishing renders."""
 
  name = "renderDefault"

pype/hosts/harmony/plugins/create/create_render.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 """Create render node."""
 from avalon import harmony
+from pype.hosts.harmony.api import plugin
 
 
-class CreateRender(harmony.Creator):
+class CreateRender(plugin.Creator):
  """Composite node for publishing renders."""
 
  name = "renderDefault"

pype/hosts/harmony/plugins/create/create_template.py

@@ -1,7 +1,7 @@
-from avalon import harmony
+from pype.hosts.harmony.api import plugin
 
 
-class CreateTemplate(harmony.Creator):
+class CreateTemplate(plugin.Creator):
  """Composite node for publishing to templates."""
 
  name = "templateDefault"

pype/hosts/hiero/api/plugin.py

@@ -592,7 +592,7 @@ def load(self):
  return track_item
 
 
-class Creator(avalon.Creator):
+class Creator(pype.Creator):
  """Creator class wrapper
  """
  clip_color = "Purple"

pype/hosts/houdini/api/plugin.py

@@ -0,0 +1,6 @@
+from avalon import houdini
+from pype.api import PypeCreatorMixin
+
+
+class Creator(PypeCreatorMixin, houdini.Creator):
+ pass

pype/hosts/houdini/plugins/create/create_alembic_camera.py

@@ -1,7 +1,7 @@
-from avalon import houdini
+from pype.hosts.houdini.api import plugin
 
 
-class CreateAlembicCamera(houdini.Creator):
+class CreateAlembicCamera(plugin.Creator):
  """Single baked camera from Alembic ROP"""
 
  name = "camera"

pype/hosts/houdini/plugins/create/create_pointcache.py

@@ -1,7 +1,7 @@
-from avalon import houdini
+from pype.hosts.houdini.api import plugin
 
 
-class CreatePointCache(houdini.Creator):
+class CreatePointCache(plugin.Creator):
  """Alembic ROP to pointcache"""
 
  name = "pointcache"

pype/hosts/houdini/plugins/create/create_vbd_cache.py

@@ -1,7 +1,7 @@
-from avalon import houdini
+from pype.hosts.houdini.api import plugin
 
 
-class CreateVDBCache(houdini.Creator):
+class CreateVDBCache(plugin.Creator):
  """OpenVDB from Geometry ROP"""
 
  name = "vbdcache"

pype/hosts/maya/api/__init__.py

@@ -151,7 +151,7 @@ def on_open(_):
  """On scene open let's assume the containers have changed."""
 
  from avalon.vendor.Qt import QtWidgets
- from ...widgets import popup
+ from pype.widgets import popup
 
  cmds.evalDeferred(
  "from pype.hosts.maya.api import lib;"
@@ -223,4 +223,4 @@ def on_task_changed(*args):
  lib.show_message(
  "Context was changed",
  ("Context was changed to {}".format(avalon.Session["AVALON_ASSET"])),
- )
+ )

pype/hosts/maya/api/plugin.py

@@ -1,5 +1,7 @@
 from avalon import api
 from avalon.vendor import qargparse
+import avalon.maya
+from pype.api import PypeCreatorMixin
 
 
 def get_reference_node_parents(ref):
@@ -26,6 +28,10 @@ def get_reference_node_parents(ref):
  return parents
 
 
+class Creator(PypeCreatorMixin, avalon.maya.Creator):
+ pass
+
+
 class ReferenceLoader(api.Loader):
  """A basic ReferenceLoader for Maya
 

pype/hosts/maya/plugins/create/create_animation.py

@@ -1,8 +1,10 @@
-import avalon.maya
-from pype.hosts.maya.api import lib
+from pype.hosts.maya.api import (
+ lib,
+ plugin
+)
 
 
-class CreateAnimation(avalon.maya.Creator):
+class CreateAnimation(plugin.Creator):
  """Animation output for character rigs"""
 
  name = "animationDefault"

pype/hosts/maya/plugins/create/create_ass.py

@@ -1,12 +1,14 @@
 from collections import OrderedDict
 
-import avalon.maya
-from pype.hosts.maya.api import lib
+from pype.hosts.maya.api import (
+ lib,
+ plugin
+)
 
 from maya import cmds
 
 
-class CreateAss(avalon.maya.Creator):
+class CreateAss(plugin.Creator):
  """Arnold Archive"""
 
  name = "ass"

pype/hosts/maya/plugins/create/create_assembly.py

@@ -1,7 +1,7 @@
-import avalon.maya
+from pype.hosts.maya.api import plugin
 
 
-class CreateAssembly(avalon.maya.Creator):
+class CreateAssembly(plugin.Creator):
  """A grouped package of loaded content"""
 
  name = "assembly"

pype/hosts/maya/plugins/create/create_camera.py

@@ -1,8 +1,10 @@
-import avalon.maya
-from pype.hosts.maya.api import lib
+from pype.hosts.maya.api import (
+ lib,
+ plugin
+)
 
 
-class CreateCamera(avalon.maya.Creator):
+class CreateCamera(plugin.Creator):
  """Single baked camera"""
 
  name = "cameraMain"
@@ -24,7 +26,7 @@ def __init__(self, *args, **kwargs):
  self.data['bakeToWorldSpace'] = True
 
 
-class CreateCameraRig(avalon.maya.Creator):
+class CreateCameraRig(plugin.Creator):
  """Complex hierarchy with camera."""
 
  name = "camerarigMain"

pype/hosts/maya/plugins/create/create_layout.py

@@ -1,7 +1,7 @@
-import avalon.maya
+from pype.hosts.maya.api import plugin
 
 
-class CreateLayout(avalon.maya.Creator):
+class CreateLayout(plugin.Creator):
  """A grouped package of loaded content"""
 
  name = "layoutMain"

pype/hosts/maya/plugins/create/create_look.py

@@ -1,8 +1,10 @@
-import avalon.maya
-from pype.hosts.maya.api import lib
+from pype.hosts.maya.api import (
+ lib,
+ plugin
+)
 
 
-class CreateLook(avalon.maya.Creator):
+class CreateLook(plugin.Creator):
  """Shader connections defining shape look"""
 
  name = "look"

pype/hosts/maya/plugins/create/create_mayaascii.py

@@ -1,7 +1,7 @@
-import avalon.maya
+from pype.hosts.maya.api import plugin
 
 
-class CreateMayaAscii(avalon.maya.Creator):
+class CreateMayaAscii(plugin.Creator):
  """Raw Maya Ascii file export"""
 
  name = "mayaAscii"

pype/hosts/maya/plugins/create/create_model.py

@@ -1,7 +1,7 @@
-import avalon.maya
+from pype.hosts.maya.api import plugin
 
 
-class CreateModel(avalon.maya.Creator):
+class CreateModel(plugin.Creator):
  """Polygonal static geometry"""
 
  name = "modelMain"