fix metaclass madness

This commit is contained in:
Ondřej Samohel 2020-11-10 18:06:26 +01:00
parent 840ed3c104
commit 2f615c9060
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
3 changed files with 13 additions and 9 deletions

View file

@ -4,10 +4,10 @@
TODO: use @dataclass when times come.
"""
from abc import ABCMeta, abstractmethod
from abc import abstractmethod
import six
import attr
import six
from avalon import api
import pyblish.api
@ -102,7 +102,8 @@ class RenderInstance(object):
raise ValueError("both tiles X a Y sizes are set to 1")
class AbstractCollectRender(AbstractMetaContextPlugin):
@six.add_metaclass(AbstractMetaContextPlugin)
class AbstractCollectRender(pyblish.api.ContextPlugin):
"""Gather all publishable render layers from renderSetup."""
order = pyblish.api.CollectorOrder + 0.01
@ -196,9 +197,12 @@ class AbstractCollectRender(AbstractMetaContextPlugin):
self.post_collecting_action()
@abstractmethod
def get_instances(self):
def get_instances(self, context):
"""Get all renderable instances and their data.
Args:
context (pyblish.api.Context): Context object.
Returns:
list of :class:`RenderInstance`: All collected renderable instances
(like render layers, write nodes, etc.)

View file

@ -1,10 +1,10 @@
from abc import ABCMeta
from pyblish.api import InstancePlugin, ContextPlugin
from pyblish.plugin import MetaPlugin, ExplicitMetaPlugin
class AbstractMetaInstancePlugin(ABCMeta, InstancePlugin):
class AbstractMetaInstancePlugin(ABCMeta, MetaPlugin):
pass
class AbstractMetaContextPlugin(ABCMeta, ContextPlugin):
class AbstractMetaContextPlugin(ABCMeta, ExplicitMetaPlugin):
pass

View file

@ -5,7 +5,7 @@ It provides Deadline JobInfo data class.
"""
import os
from abc import ABCMeta, abstractmethod
from abc import abstractmethod
import platform
import getpass
from collections import OrderedDict
@ -352,7 +352,7 @@ class DeadlineJobInfo:
@six.add_metaclass(AbstractMetaInstancePlugin)
class AbstractSubmitDeadline:
class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
"""Class abstracting access to Deadline."""
label = "Submit to Deadline"