Merge branch 'develop' of https://github.com/ynput/ayon-core into chore/houdini_remove_unused_create_remote_publish

server_addon/houdini/client/ayon_houdini/api/__init__.py

@@ -4,10 +4,6 @@ from .pipeline import (
     containerise
 )
 
-from .plugin import (
-    Creator,
-)
-
 from .lib import (
     lsattr,
     lsattrs,
@@ -23,8 +19,6 @@ __all__ = [
     "ls",
     "containerise",
 
-    "Creator",
-
     # Utility functions
     "lsattr",
     "lsattrs",

server_addon/houdini/client/ayon_houdini/api/plugin.py

@@ -10,8 +10,7 @@ import hou
 import pyblish.api
 from ayon_core.pipeline import (
     CreatorError,
-    LegacyCreator,
-    Creator as NewCreator,
+    Creator,
     CreatedInstance,
     AYON_INSTANCE_ID,
     AVALON_INSTANCE_ID,
@@ -26,80 +25,6 @@ from .lib import imprint, read, lsattr, add_self_publish_button
 SETTINGS_CATEGORY = "houdini"
 
 
-class Creator(LegacyCreator):
-    """Creator plugin to create instances in Houdini
-
-    To support the wide range of node types for render output (Alembic, VDB,
-    Mantra) the Creator needs a node type to create the correct instance
-
-    By default, if none is given, is `geometry`. An example of accepted node
-    types: geometry, alembic, ifd (mantra)
-
-    Please check the Houdini documentation for more node types.
-
-    Tip: to find the exact node type to create press the `i` left of the node
-    when hovering over a node. The information is visible under the name of
-    the node.
-
-    Deprecated:
-        This creator is deprecated and will be removed in future version.
-
-    """
-    defaults = ['Main']
-
-    def __init__(self, *args, **kwargs):
-        super(Creator, self).__init__(*args, **kwargs)
-        self.nodes = []
-
-    def process(self):
-        """This is the base functionality to create instances in Houdini
-
-        The selected nodes are stored in self to be used in an override method.
-        This is currently necessary in order to support the multiple output
-        types in Houdini which can only be rendered through their own node.
-
-        Default node type if none is given is `geometry`
-
-        It also makes it easier to apply custom settings per instance type
-
-        Example of override method for Alembic:
-
-            def process(self):
-                instance =  super(CreateEpicNode, self, process()
-                # Set parameters for Alembic node
-                instance.setParms(
-                    {"sop_path": "$HIP/%s.abc" % self.nodes[0]}
-                )
-
-        Returns:
-            hou.Node
-
-        """
-        try:
-            if (self.options or {}).get("useSelection"):
-                self.nodes = hou.selectedNodes()
-
-            # Get the node type and remove it from the data, not needed
-            node_type = self.data.pop("node_type", None)
-            if node_type is None:
-                node_type = "geometry"
-
-            # Get out node
-            out = hou.node("/out")
-            instance = out.createNode(node_type, node_name=self.name)
-            instance.moveToGoodPosition()
-
-            imprint(instance, self.data)
-
-            self._process(instance)
-
-        except hou.Error as er:
-            six.reraise(
-                CreatorError,
-                CreatorError("Creator error: {}".format(er)),
-                sys.exc_info()[2])
-
-
 class HoudiniCreatorBase(object):
     @staticmethod
     def cache_instance_data(shared_data):
@@ -175,7 +100,7 @@ class HoudiniCreatorBase(object):
 
 
 @six.add_metaclass(ABCMeta)
-class HoudiniCreator(NewCreator, HoudiniCreatorBase):
+class HoudiniCreator(Creator, HoudiniCreatorBase):
     """Base class for most of the Houdini creator plugins."""
     selected_nodes = []
     settings_name = None

server_addon/houdini/client/ayon_houdini/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'houdini' version."""
-__version__ = "0.3.4"
+__version__ = "0.3.5"

server_addon/houdini/package.py

@@ -1,6 +1,6 @@
 name = "houdini"
 title = "Houdini"
-version = "0.3.4"
+version = "0.3.5"
 
 client_dir = "ayon_houdini"