From 3a499551ebaa1712877a62576432a171b0200acc Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Fri, 9 Jun 2023 18:54:02 +0200 Subject: [PATCH] :rotating_light: calming :dog: fixing linter issues --- .../publish/validate_animation_content.py | 7 +++--- .../publish/validate_assembly_transforms.py | 13 +++++------ .../plugins/publish/validate_attributes.py | 11 +++------- .../publish/validate_camera_attributes.py | 9 ++++---- .../plugins/publish/validate_cycle_error.py | 11 ++++------ .../publish/validate_instancer_content.py | 9 ++++---- .../validate_instancer_frame_ranges.py | 11 +++++----- .../publish/validate_look_members_unique.py | 11 +++++----- .../publish/validate_look_single_shader.py | 12 +++++----- .../validate_mesh_arnold_attributes.py | 1 + .../validate_mesh_vertices_have_edges.py | 21 ++++++++---------- .../plugins/publish/validate_model_name.py | 22 ++++++++----------- .../plugins/publish/validate_step_size.py | 7 +++--- 13 files changed, 64 insertions(+), 81 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_animation_content.py b/openpype/hosts/maya/plugins/publish/validate_animation_content.py index e55c24e4b2..99acdc7b8f 100644 --- a/openpype/hosts/maya/plugins/publish/validate_animation_content.py +++ b/openpype/hosts/maya/plugins/publish/validate_animation_content.py @@ -1,8 +1,8 @@ import pyblish.api import openpype.hosts.maya.api.action from openpype.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError + PublishValidationError, + ValidateContentsOrder ) @@ -50,4 +50,5 @@ class ValidateAnimationContent(pyblish.api.InstancePlugin): def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Animation content is invalid. See log.") + raise PublishValidationError( + "Animation content is invalid. See log.") diff --git a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py index f8c4c0343a..a24455ebaa 100644 --- a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py +++ b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py @@ -1,13 +1,8 @@ import pyblish.api - from maya import cmds import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( - PublishValidationError, - RepairAction -) - +from openpype.pipeline.publish import PublishValidationError, RepairAction class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): @@ -42,8 +37,9 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Found {} invalid transforms of assembly " - "items".format(len(invalid))) + raise PublishValidationError( + ("Found {} invalid transforms of assembly " + "items").format(len(invalid))) @classmethod def get_invalid(cls, instance): @@ -94,6 +90,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin): """ from qtpy import QtWidgets + from openpype.hosts.maya.api import lib # Store namespace in variable, cosmetics thingy diff --git a/openpype/hosts/maya/plugins/publish/validate_attributes.py b/openpype/hosts/maya/plugins/publish/validate_attributes.py index 2c4c274c39..c76d979fbf 100644 --- a/openpype/hosts/maya/plugins/publish/validate_attributes.py +++ b/openpype/hosts/maya/plugins/publish/validate_attributes.py @@ -1,17 +1,12 @@ from collections import defaultdict -from maya import cmds - import pyblish.api +from maya import cmds from openpype.hosts.maya.api.lib import set_attribute from openpype.pipeline.publish import ( - RepairAction, - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - + OptionalPyblishPluginMixin, PublishValidationError, RepairAction, + ValidateContentsOrder) class ValidateAttributes(pyblish.api.InstancePlugin, diff --git a/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py b/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py index 8545bf517d..e5745612e9 100644 --- a/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py +++ b/openpype/hosts/maya/plugins/publish/validate_camera_attributes.py @@ -1,11 +1,9 @@ +import pyblish.api from maya import cmds -import pyblish.api import openpype.hosts.maya.api.action from openpype.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError -) + PublishValidationError, ValidateContentsOrder) class ValidateCameraAttributes(pyblish.api.InstancePlugin): @@ -68,4 +66,5 @@ class ValidateCameraAttributes(pyblish.api.InstancePlugin): invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Invalid camera attributes: %s" % invalid) + raise PublishValidationError( + "Invalid camera attributes: {}".format(invalid)) diff --git a/openpype/hosts/maya/plugins/publish/validate_cycle_error.py b/openpype/hosts/maya/plugins/publish/validate_cycle_error.py index 4d19c29d4c..24da091246 100644 --- a/openpype/hosts/maya/plugins/publish/validate_cycle_error.py +++ b/openpype/hosts/maya/plugins/publish/validate_cycle_error.py @@ -1,14 +1,10 @@ -from maya import cmds - import pyblish.api +from maya import cmds import openpype.hosts.maya.api.action from openpype.hosts.maya.api.lib import maintained_selection from openpype.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) + OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder) class ValidateCycleError(pyblish.api.InstancePlugin, @@ -28,7 +24,8 @@ class ValidateCycleError(pyblish.api.InstancePlugin, invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Nodes produce a cycle error: %s" % invalid) + raise PublishValidationError( + "Nodes produce a cycle error: {}".format(invalid)) @classmethod def get_invalid(cls, instance): diff --git a/openpype/hosts/maya/plugins/publish/validate_instancer_content.py b/openpype/hosts/maya/plugins/publish/validate_instancer_content.py index 1ae3ac0305..2f14693ef2 100644 --- a/openpype/hosts/maya/plugins/publish/validate_instancer_content.py +++ b/openpype/hosts/maya/plugins/publish/validate_instancer_content.py @@ -1,10 +1,8 @@ import maya.cmds as cmds - import pyblish.api + from openpype.hosts.maya.api import lib -from openpype.pipeline.publish import ( - PublishValidationError -) +from openpype.pipeline.publish import PublishValidationError class ValidateInstancerContent(pyblish.api.InstancePlugin): @@ -55,7 +53,8 @@ class ValidateInstancerContent(pyblish.api.InstancePlugin): error = True if error: - raise PublishValidationError("Instancer Content is invalid. See log.") + raise PublishValidationError( + "Instancer Content is invalid. See log.") def check_geometry_hidden(self, export_members): diff --git a/openpype/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py b/openpype/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py index 766a7ad6d7..fcfcdce8b6 100644 --- a/openpype/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py +++ b/openpype/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py @@ -1,9 +1,9 @@ import os import re + import pyblish.api -from openpype.pipeline.publish import ( - PublishValidationError -) + +from openpype.pipeline.publish import PublishValidationError VERBOSE = False @@ -167,5 +167,6 @@ class ValidateInstancerFrameRanges(pyblish.api.InstancePlugin): if invalid: self.log.error("Invalid nodes: {0}".format(invalid)) - raise PublishValidationError("Invalid particle caches in instance. " - "See logs for details.") + raise PublishValidationError( + ("Invalid particle caches in instance. " + "See logs for details.")) diff --git a/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py b/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py index 12efb98573..4e01b55249 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_members_unique.py @@ -1,11 +1,11 @@ from collections import defaultdict import pyblish.api + import openpype.hosts.maya.api.action from openpype.pipeline.publish import ( - ValidatePipelineOrder, - PublishValidationError -) + PublishValidationError, ValidatePipelineOrder) + class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin): """Validate the relational nodes of the look data to ensure every node is @@ -35,8 +35,9 @@ class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin): invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Members found without non-unique IDs: " - "{0}".format(invalid)) + raise PublishValidationError( + ("Members found without non-unique IDs: " + "{0}").format(invalid)) @staticmethod def get_invalid(instance): diff --git a/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py b/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py index 2b02d421aa..532283e335 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_single_shader.py @@ -1,11 +1,9 @@ +import pyblish.api from maya import cmds -import pyblish.api import openpype.hosts.maya.api.action from openpype.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError -) + PublishValidationError, ValidateContentsOrder) class ValidateSingleShader(pyblish.api.InstancePlugin): @@ -26,9 +24,9 @@ class ValidateSingleShader(pyblish.api.InstancePlugin): invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Found shapes which don't have a single shader " - "assigned: " - "\n{}".format(invalid)) + raise PublishValidationError( + ("Found shapes which don't have a single shader " + "assigned:\n{}").format(invalid)) @classmethod def get_invalid(cls, instance): diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py b/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py index 64b122bfdc..55624726ea 100644 --- a/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py @@ -16,6 +16,7 @@ from openpype.pipeline.publish import ( PublishValidationError ) + class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin, OptionalPyblishPluginMixin): """Validate the mesh has default Arnold attributes. diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py index ec2343a4b0..7167859444 100644 --- a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py @@ -1,15 +1,10 @@ +import pyblish.api from maya import cmds -import pyblish.api import openpype.hosts.maya.api.action -from openpype.pipeline.publish import ( - RepairAction, - ValidateMeshOrder, - PublishValidationError -) - - from openpype.hosts.maya.api.lib import len_flattened +from openpype.pipeline.publish import ( + PublishValidationError, RepairAction, ValidateMeshOrder) class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin): @@ -43,8 +38,9 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin): # This fix only works in Maya 2016 EXT2 and newer if float(cmds.about(version=True)) <= 2016.0: - raise PublishValidationError("Repair not supported in Maya version below " - "2016 EXT 2") + raise PublishValidationError( + ("Repair not supported in Maya version below " + "2016 EXT 2")) invalid = cls.get_invalid(instance) for node in invalid: @@ -79,5 +75,6 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin): invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Meshes found in instance with vertices that " - "have no edges: %s" % invalid) + raise PublishValidationError( + ("Meshes found in instance with vertices that " + "have no edges: {}").format(invalid)) diff --git a/openpype/hosts/maya/plugins/publish/validate_model_name.py b/openpype/hosts/maya/plugins/publish/validate_model_name.py index 185d5e3196..6948dcf724 100644 --- a/openpype/hosts/maya/plugins/publish/validate_model_name.py +++ b/openpype/hosts/maya/plugins/publish/validate_model_name.py @@ -1,25 +1,20 @@ # -*- coding: utf-8 -*- """Validate model nodes names.""" import os -import re import platform +import re +import gridfs +import pyblish.api from maya import cmds -import pyblish.api -from openpype.pipeline import legacy_io -from openpype.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin - PublishValidationError -) - - import openpype.hosts.maya.api.action +from openpype.client.mongo import OpenPypeMongoConnection from openpype.hosts.maya.api.shader_definition_editor import ( DEFINITION_FILENAME) -from openpype.client.mongo import OpenPypeMongoConnection -import gridfs +from openpype.pipeline import legacy_io +from openpype.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder) class ValidateModelName(pyblish.api.InstancePlugin, @@ -161,4 +156,5 @@ class ValidateModelName(pyblish.api.InstancePlugin, invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Model naming is invalid. See the log.") + raise PublishValidationError( + "Model naming is invalid. See the log.") diff --git a/openpype/hosts/maya/plugins/publish/validate_step_size.py b/openpype/hosts/maya/plugins/publish/validate_step_size.py index 288ed426bd..493a6ee65c 100644 --- a/openpype/hosts/maya/plugins/publish/validate_step_size.py +++ b/openpype/hosts/maya/plugins/publish/validate_step_size.py @@ -2,8 +2,8 @@ import pyblish.api import openpype.hosts.maya.api.action from openpype.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError + PublishValidationError, + ValidateContentsOrder ) @@ -43,4 +43,5 @@ class ValidateStepSize(pyblish.api.InstancePlugin): invalid = self.get_invalid(instance) if invalid: - raise PublishValidationError("Invalid instances found: {0}".format(invalid)) + raise PublishValidationError( + "Invalid instances found: {0}".format(invalid))