diff --git a/openpype/hosts/maya/api/fbx.py b/openpype/hosts/maya/api/fbx.py index 260241f5fc..e9cf8af491 100644 --- a/openpype/hosts/maya/api/fbx.py +++ b/openpype/hosts/maya/api/fbx.py @@ -2,7 +2,7 @@ """Tools to work with FBX.""" import logging -from pyblish.api import Instance +import pyblish.api from maya import cmds # noqa import maya.mel as mel # noqa @@ -141,7 +141,7 @@ class FBXExtractor: return options def set_options_from_instance(self, instance): - # type: (Instance) -> None + # type: (pyblish.api.Instance) -> None """Sets FBX export options from data in the instance. Args: diff --git a/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py b/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py index 8461e74d6d..1bb2785dd6 100644 --- a/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py +++ b/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py @@ -5,7 +5,7 @@ import sys import platform from maya.OpenMaya import MGlobal # noqa -from pyblish.api import InstancePlugin, IntegratorOrder, Context +import pyblish.api from openpype.lib import is_running_from_build from openpype.pipeline.publish.lib import get_published_workfile_instance from openpype.pipeline.publish import KnownPublishError @@ -14,9 +14,9 @@ from openpype.modules.royalrender.rr_job import RRJob, CustomAttribute from openpype.pipeline.farm.tools import iter_expected_files -class CreateMayaRoyalRenderJob(InstancePlugin): +class CreateMayaRoyalRenderJob(pyblish.api.InstancePlugin): label = "Create Maya Render job in RR" - order = IntegratorOrder + 0.1 + order = pyblish.api.IntegratorOrder + 0.1 families = ["renderlayer"] targets = ["local"] use_published = True @@ -128,7 +128,7 @@ class CreateMayaRoyalRenderJob(InstancePlugin): @staticmethod def _resolve_rr_path(context, rr_path_name): - # type: (Context, str) -> str + # type: (pyblish.api.Context, str) -> str rr_settings = ( context.data ["system_settings"] diff --git a/openpype/modules/royalrender/plugins/publish/create_nuke_deadline_job.py b/openpype/modules/royalrender/plugins/publish/create_nuke_deadline_job.py index 0d5e440c90..a90c4c4f83 100644 --- a/openpype/modules/royalrender/plugins/publish/create_nuke_deadline_job.py +++ b/openpype/modules/royalrender/plugins/publish/create_nuke_deadline_job.py @@ -5,7 +5,7 @@ import re import platform from datetime import datetime -from pyblish.api import InstancePlugin, IntegratorOrder, Context +import pyblish.api from openpype.tests.lib import is_in_tests from openpype.pipeline.publish.lib import get_published_workfile_instance from openpype.pipeline.publish import KnownPublishError @@ -20,10 +20,11 @@ from openpype.lib import ( from openpype.pipeline import OpenPypePyblishPluginMixin -class CreateNukeRoyalRenderJob(InstancePlugin, OpenPypePyblishPluginMixin): +class CreateNukeRoyalRenderJob(pyblish.api.InstancePlugin, + OpenPypePyblishPluginMixin): """Creates separate rendering job for Royal Render""" label = "Create Nuke Render job in RR" - order = IntegratorOrder + 0.1 + order = pyblish.api.IntegratorOrder + 0.1 hosts = ["nuke"] families = ["render", "prerender"] targets = ["local"] @@ -248,7 +249,7 @@ class CreateNukeRoyalRenderJob(InstancePlugin, OpenPypePyblishPluginMixin): @staticmethod def _resolve_rr_path(context, rr_path_name): - # type: (Context, str) -> str + # type: (pyblish.api.Context, str) -> str rr_settings = ( context.data ["system_settings"] diff --git a/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py b/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py index af5bdfd5e6..c652509373 100644 --- a/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py +++ b/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py @@ -4,7 +4,7 @@ import os import attr import json -from pyblish.api import InstancePlugin, IntegratorOrder +import pyblish.api from openpype.modules.royalrender.rr_job import ( RRJob, @@ -24,7 +24,7 @@ from openpype.pipeline.farm.pyblish_functions import ( ) -class CreatePublishRoyalRenderJob(InstancePlugin): +class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin): """Creates job which publishes rendered files to publish area. Job waits until all rendering jobs are finished, triggers `publish` command @@ -34,7 +34,7 @@ class CreatePublishRoyalRenderJob(InstancePlugin): When triggered it produces .log file next to .json file in work area. """ label = "Create publish job in RR" - order = IntegratorOrder + 0.2 + order = pyblish.api.IntegratorOrder + 0.2 icon = "tractor" targets = ["local"] hosts = ["fusion", "maya", "nuke", "celaction", "aftereffects", "harmony"] diff --git a/openpype/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py b/openpype/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py index 6e91dff6ac..8fc8604b83 100644 --- a/openpype/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py +++ b/openpype/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py @@ -3,7 +3,7 @@ import tempfile import platform -from pyblish.api import IntegratorOrder, ContextPlugin, Context +import pyblish.api from openpype.modules.royalrender.api import ( RRJob, Api as rrApi, @@ -12,10 +12,10 @@ from openpype.modules.royalrender.api import ( from openpype.pipeline.publish import KnownPublishError -class SubmitJobsToRoyalRender(ContextPlugin): +class SubmitJobsToRoyalRender(pyblish.api.ContextPlugin): """Find all jobs, create submission XML and submit it to RoyalRender.""" label = "Submit jobs to RoyalRender" - order = IntegratorOrder + 0.3 + order = pyblish.api.IntegratorOrder + 0.3 targets = ["local"] def __init__(self): @@ -103,7 +103,7 @@ class SubmitJobsToRoyalRender(ContextPlugin): @staticmethod def _resolve_rr_path(context, rr_path_name): - # type: (Context, str) -> str + # type: (pyblish.api.Context, str) -> str rr_settings = ( context.data ["system_settings"] diff --git a/openpype/pipeline/farm/pyblish_functions.py b/openpype/pipeline/farm/pyblish_functions.py index 89bff6dfee..8be0887b0d 100644 --- a/openpype/pipeline/farm/pyblish_functions.py +++ b/openpype/pipeline/farm/pyblish_functions.py @@ -1,6 +1,6 @@ import copy import attr -from pyblish.api import Instance +import pyblish.api import os import clique from copy import deepcopy @@ -161,7 +161,7 @@ def get_transferable_representations(instance): def create_skeleton_instance( instance, families_transfer=None, instance_transfer=None): - # type: (Instance, list, dict) -> dict + # type: (pyblish.api.Instance, list, dict) -> dict """Create skeleton instance from original instance data. This will create dictionary containing skeleton