From bff1049414ad923164c3a6d73ad779fea830fe86 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 19 May 2025 22:07:32 +0930 Subject: [PATCH] chore: correct pylint errors ref: #765 --- app/access/fields.py | 1 - app/access/middleware/request.py | 5 ----- app/access/mixin.py | 2 +- app/access/mixins/organization.py | 2 -- app/access/mixins/permissions.py | 3 --- app/access/models/__init__.py | 8 ++++---- app/access/models/entity.py | 3 --- app/access/models/entity_history.py | 1 - app/access/models/organization.py | 2 +- app/access/models/tenancy.py | 1 - app/access/serializers/organization_notes.py | 7 ------- app/access/serializers/role_notes.py | 7 ------- app/access/serializers/team_notes.py | 7 ------- app/access/serializers/team_user.py | 2 -- app/access/serializers/teams.py | 2 +- app/access/urls.py | 1 - app/access/viewsets/organization.py | 2 +- app/access/viewsets/team.py | 2 +- app/access/viewsets/team_user.py | 2 +- app/accounting/models/__init__.py | 2 +- app/accounting/models/asset_base.py | 3 --- app/api/models/__init__.py | 2 +- app/api/react_ui_metadata.py | 3 --- app/api/serializers/access.py | 2 +- app/api/serializers/common.py | 2 -- app/api/serializers/core/ticket.py | 2 -- app/api/serializers/core/ticket_category.py | 5 ----- .../core/ticket_comment_category.py | 2 -- app/api/serializers/itam/device.py | 2 -- app/api/serializers/itam/inventory.py | 3 --- .../project_management/project_state.py | 2 -- .../project_management/project_type.py | 2 -- .../serializers/project_management/projects.py | 1 - app/api/viewsets/common.py | 1 - app/assistance/models/knowledge_base.py | 1 - .../models/model_knowledge_base_article.py | 3 --- .../serializers/knowledge_base_category.py | 2 +- .../knowledge_base_category_notes.py | 7 ------- .../serializers/knowledge_base_notes.py | 7 ------- .../model_knowledge_base_article.py | 3 --- app/assistance/serializers/request.py | 2 -- app/assistance/viewsets/knowledge_base.py | 2 +- .../viewsets/knowledge_base_category.py | 2 +- .../viewsets/model_knowledge_base_article.py | 2 +- app/assistance/viewsets/request.py | 4 +--- app/centurion_feature_flag/urls/django.py | 4 ++-- app/centurion_feature_flag/views/disabled.py | 2 +- .../serializers/config_group.py | 1 - .../serializers/config_group_notes.py | 7 ------- .../serializers/config_group_software.py | 1 - app/config_management/viewsets/config_group.py | 2 +- .../viewsets/config_group_software.py | 2 +- app/core/exceptions.py | 6 +++--- app/core/fields/__init__.py | 4 ++-- app/core/fields/badge.py | 2 -- app/core/fields/markdown.py | 2 -- .../lib/markdown_plugins/model_reference.py | 1 - app/core/lib/slash_commands/duration.py | 2 +- app/core/management/commands/manufacturer.py | 1 - app/core/models/__init__.py | 8 ++++---- app/core/models/model_history.py | 2 +- app/core/models/model_notes.py | 10 ---------- app/core/models/ticket/ticket.py | 8 +------- app/core/models/ticket/ticket_category.py | 1 - .../models/ticket/ticket_comment_category.py | 1 - app/core/models/ticket/ticket_linked_items.py | 6 +++--- app/core/models/ticket_base.py | 1 - app/core/models/ticket_comment_action.py | 4 ---- app/core/models/ticket_comment_base.py | 1 - app/core/serializers/celery_log.py | 6 ------ app/core/serializers/manufacturer.py | 3 --- app/core/serializers/manufacturer_notes.py | 1 - app/core/serializers/model_notes.py | 1 - app/core/serializers/ticket_category.py | 1 - app/core/serializers/ticket_category_notes.py | 1 - app/core/serializers/ticket_comment.py | 2 -- .../serializers/ticket_comment_category.py | 3 --- .../ticket_comment_category_notes.py | 1 - .../serializers/ticket_comment_depreciated.py | 2 +- app/core/serializers/ticket_depreciated.py | 5 ++--- app/core/serializers/ticket_linked_item.py | 3 --- app/core/serializers/ticket_related.py | 4 +--- .../test_related_ticket_serializer.py | 2 +- app/core/viewsets/celery_log.py | 2 +- app/core/viewsets/manufacturer.py | 2 +- app/core/viewsets/model_notes.py | 12 +----------- app/core/viewsets/related_ticket.py | 6 ++---- app/core/viewsets/ticket_category.py | 2 +- app/core/viewsets/ticket_comment_category.py | 2 +- .../viewsets/ticket_comment_depreciated.py | 13 +------------ app/core/viewsets/ticket_depreciated.py | 12 +++++------- app/core/viewsets/ticket_linked_item.py | 3 +-- app/devops/models/__init__.py | 10 +++++----- app/devops/models/git_repository/__init__.py | 4 ++-- .../models/software_enable_feature_flag.py | 2 +- app/devops/serializers/git_repository/base.py | 2 +- .../serializers/git_repository/github.py | 4 +--- .../serializers/git_repository/gitlab.py | 8 +------- .../test_unit_feature_flag_history_api_v2.py | 1 - app/devops/urls_public.py | 2 +- app/devops/viewsets/git_repository.py | 2 +- app/human_resources/models/__init__.py | 2 +- app/itam/models/__init__.py | 4 ++-- app/itam/models/device.py | 2 -- app/itam/models/device_models.py | 2 -- app/itam/serializers/device.py | 5 +---- app/itam/serializers/device_model.py | 2 -- app/itam/serializers/device_model_notes.py | 3 --- app/itam/serializers/device_notes.py | 11 ----------- .../serializers/device_operating_system.py | 4 +--- app/itam/serializers/device_software.py | 3 +-- app/itam/serializers/device_type.py | 1 - app/itam/serializers/device_type_notes.py | 4 ---- app/itam/serializers/inventory.py | 1 - app/itam/serializers/operating_system_notes.py | 4 ---- .../serializers/operating_system_version.py | 4 ---- .../operating_system_version_notes.py | 4 ---- app/itam/serializers/software_category.py | 3 --- .../serializers/software_category_notes.py | 1 - app/itam/serializers/software_notes.py | 1 - app/itam/serializers/software_version_notes.py | 1 - app/itam/tasks/inventory.py | 7 ++----- app/itam/urls.py | 3 +-- app/itam/viewsets/device.py | 2 +- app/itam/viewsets/device_model.py | 4 +--- app/itam/viewsets/device_operating_system.py | 18 ++---------------- app/itam/viewsets/device_software.py | 16 +--------------- app/itam/viewsets/device_type.py | 4 +--- app/itam/viewsets/inventory.py | 2 -- app/itam/viewsets/operating_system.py | 2 +- app/itam/viewsets/operating_system_version.py | 2 +- app/itam/viewsets/software.py | 2 +- app/itam/viewsets/software_category.py | 2 +- app/itam/viewsets/software_version.py | 2 +- app/itim/models/__init__.py | 8 ++++---- app/itim/models/clusters.py | 3 --- app/itim/models/services.py | 4 ---- app/itim/serializers/change.py | 3 --- app/itim/serializers/cluster_notes.py | 1 - app/itim/serializers/cluster_type.py | 3 --- app/itim/serializers/cluster_type_notes.py | 1 - app/itim/serializers/incident.py | 2 -- app/itim/serializers/port.py | 3 --- app/itim/serializers/port_notes.py | 1 - app/itim/serializers/problem.py | 2 -- app/itim/serializers/service.py | 1 - app/itim/serializers/service_notes.py | 1 - app/itim/viewsets/cluster.py | 2 +- app/itim/viewsets/cluster_type.py | 2 +- app/itim/viewsets/port.py | 2 +- app/itim/viewsets/service.py | 2 +- app/itim/viewsets/service_cluster.py | 4 ++-- app/itim/viewsets/service_device.py | 4 ++-- .../models/project_milestone.py | 2 +- .../models/project_states.py | 1 - app/project_management/models/project_types.py | 1 - app/project_management/models/projects.py | 1 - app/project_management/serializers/project.py | 2 +- .../serializers/project_milestone.py | 1 - .../serializers/project_milestone_notes.py | 1 - .../serializers/project_notes.py | 1 - .../serializers/project_state_notes.py | 1 - .../serializers/project_states.py | 2 -- .../serializers/project_task.py | 2 -- .../serializers/project_type.py | 2 -- .../serializers/project_type_notes.py | 1 - app/project_management/viewsets/project.py | 8 +++----- .../viewsets/project_milestone.py | 2 +- .../viewsets/project_state.py | 2 +- .../viewsets/project_type.py | 2 +- .../management/commands/device_model.py | 1 - .../management/commands/device_type.py | 1 - app/settings/management/commands/software.py | 1 - .../management/commands/software_categories.py | 1 - app/settings/models/__init__.py | 4 ++-- app/settings/models/external_link.py | 2 -- app/settings/serializers/external_links.py | 2 -- .../serializers/external_links_notes.py | 4 ---- app/settings/viewsets/app_settings.py | 2 +- app/settings/viewsets/external_link.py | 6 +++++- app/settings/viewsets/user_settings.py | 2 +- 181 files changed, 119 insertions(+), 448 deletions(-) diff --git a/app/access/fields.py b/app/access/fields.py index c8b9e30c..43b81698 100644 --- a/app/access/fields.py +++ b/app/access/fields.py @@ -1,6 +1,5 @@ from django.db import models from django.utils.timezone import now -from django.template.defaultfilters import slugify class AutoCreatedField(models.DateTimeField): """ diff --git a/app/access/middleware/request.py b/app/access/middleware/request.py index c609fb74..140af97d 100644 --- a/app/access/middleware/request.py +++ b/app/access/middleware/request.py @@ -1,10 +1,5 @@ import django -from django.contrib.auth.middleware import ( - AuthenticationMiddleware, - SimpleLazyObject, - partial, -) from django.contrib.auth.models import Group from django.utils.deprecation import MiddlewareMixin diff --git a/app/access/mixin.py b/app/access/mixin.py index 4bebe8f8..556eeb4a 100644 --- a/app/access/mixin.py +++ b/app/access/mixin.py @@ -1,5 +1,5 @@ -from django.contrib.auth.mixins import AccessMixin, PermissionRequiredMixin +from django.contrib.auth.mixins import AccessMixin from django.contrib.auth.models import Group from django.core.exceptions import PermissionDenied from django.utils.functional import cached_property diff --git a/app/access/mixins/organization.py b/app/access/mixins/organization.py index 1d318f81..1d87b254 100644 --- a/app/access/mixins/organization.py +++ b/app/access/mixins/organization.py @@ -1,10 +1,8 @@ import django -from django.contrib.auth.models import Group from django.db import models from access.models.tenant import Tenant as Organization -from access.models.team import Team User = django.contrib.auth.get_user_model() diff --git a/app/access/mixins/permissions.py b/app/access/mixins/permissions.py index 9b9d31f9..0da023f7 100644 --- a/app/access/mixins/permissions.py +++ b/app/access/mixins/permissions.py @@ -1,8 +1,5 @@ import traceback -from django.core.exceptions import ObjectDoesNotExist - -from rest_framework import exceptions from rest_framework.permissions import DjangoObjectPermissions from access.models.tenancy import Tenant, TenancyObject diff --git a/app/access/models/__init__.py b/app/access/models/__init__.py index de76019a..1c20e26c 100644 --- a/app/access/models/__init__.py +++ b/app/access/models/__init__.py @@ -1,4 +1,4 @@ -from . import contact -from . import company_base -from . import person -from . import role +from . import contact # pylint: disable=W0611:unused-import +from . import company_base # pylint: disable=W0611:unused-import +from . import person # pylint: disable=W0611:unused-import +from . import role # pylint: disable=W0611:unused-import diff --git a/app/access/models/entity.py b/app/access/models/entity.py index ae602311..75032f5f 100644 --- a/app/access/models/entity.py +++ b/app/access/models/entity.py @@ -5,8 +5,6 @@ from rest_framework.reverse import reverse from access.fields import AutoCreatedField, AutoLastModifiedField from access.models.tenancy import TenancyObject -from core.lib.feature_not_used import FeatureNotUsed - class Entity( @@ -107,7 +105,6 @@ class Entity( ): return related_object.name - break return '' diff --git a/app/access/models/entity_history.py b/app/access/models/entity_history.py index 3ee82662..17dd0698 100644 --- a/app/access/models/entity_history.py +++ b/app/access/models/entity_history.py @@ -4,7 +4,6 @@ from access.models.entity import Entity from core.models.model_history import ModelHistory -from devops.models.feature_flag import FeatureFlag diff --git a/app/access/models/organization.py b/app/access/models/organization.py index c7f5047a..fa469518 100644 --- a/app/access/models/organization.py +++ b/app/access/models/organization.py @@ -1 +1 @@ -from .tenant import Tenant as Organization +from .tenant import Tenant as Organization # pylint: disable=W0611:unused-import diff --git a/app/access/models/tenancy.py b/app/access/models/tenancy.py index d8f28704..e8a12667 100644 --- a/app/access/models/tenancy.py +++ b/app/access/models/tenancy.py @@ -1,4 +1,3 @@ -import django import logging from django.db import models diff --git a/app/access/serializers/organization_notes.py b/app/access/serializers/organization_notes.py index 6cf79efd..62e516cf 100644 --- a/app/access/serializers/organization_notes.py +++ b/app/access/serializers/organization_notes.py @@ -1,13 +1,6 @@ -from rest_framework import serializers - from access.models.organization_notes import OrganizationNotes -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/access/serializers/role_notes.py b/app/access/serializers/role_notes.py index f33a36da..f879d17f 100644 --- a/app/access/serializers/role_notes.py +++ b/app/access/serializers/role_notes.py @@ -1,13 +1,6 @@ -from rest_framework import serializers - from access.models.role_notes import RoleNotes -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/access/serializers/team_notes.py b/app/access/serializers/team_notes.py index 06035115..ec0dcaa8 100644 --- a/app/access/serializers/team_notes.py +++ b/app/access/serializers/team_notes.py @@ -1,13 +1,6 @@ -from rest_framework import serializers - from access.models.team_notes import TeamNotes -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/access/serializers/team_user.py b/app/access/serializers/team_user.py index 198748cf..7c860d05 100644 --- a/app/access/serializers/team_user.py +++ b/app/access/serializers/team_user.py @@ -1,5 +1,3 @@ -from rest_framework.reverse import reverse - from rest_framework import serializers from access.models.team_user import TeamUsers diff --git a/app/access/serializers/teams.py b/app/access/serializers/teams.py index 8a6bda0e..bf0b8ede 100644 --- a/app/access/serializers/teams.py +++ b/app/access/serializers/teams.py @@ -9,7 +9,7 @@ from api.serializers import common from access.functions.permissions import permission_queryset from access.serializers.organization import TenantBaseSerializer -from centurion.serializers.permission import Permission, PermissionBaseSerializer +from centurion.serializers.permission import PermissionBaseSerializer from core import fields as centurion_field diff --git a/app/access/urls.py b/app/access/urls.py index df132e1e..06824c05 100644 --- a/app/access/urls.py +++ b/app/access/urls.py @@ -1,6 +1,5 @@ from django.urls import path -from . import views from .views import team, organization, user app_name = "Access" diff --git a/app/access/viewsets/organization.py b/app/access/viewsets/organization.py index b74a4286..390b8b04 100644 --- a/app/access/viewsets/organization.py +++ b/app/access/viewsets/organization.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from access.models.organization_history import OrganizationHistory # pylint: disable=W0611:unused-import -from access.serializers.organization import ( +from access.serializers.organization import ( # pylint: disable=W0611:unused-import Tenant, TenantModelSerializer, TenantViewSerializer diff --git a/app/access/viewsets/team.py b/app/access/viewsets/team.py index 07b42b56..6614bd9a 100644 --- a/app/access/viewsets/team.py +++ b/app/access/viewsets/team.py @@ -3,7 +3,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiPara from access.models.tenant import Tenant as Organization # THis import only exists so that the migrations can be created from access.models.team_history import TeamHistory # pylint: disable=W0611:unused-import -from access.serializers.teams import ( +from access.serializers.teams import ( # pylint: disable=W0611:unused-import Team, TeamModelSerializer, TeamViewSerializer diff --git a/app/access/viewsets/team_user.py b/app/access/viewsets/team_user.py index 26e10e0a..dadac267 100644 --- a/app/access/viewsets/team_user.py +++ b/app/access/viewsets/team_user.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiPara from access.models.team import Team -from access.serializers.team_user import ( +from access.serializers.team_user import ( # pylint: disable=W0611:unused-import TeamUsers, TeamUserModelSerializer, TeamUserViewSerializer diff --git a/app/accounting/models/__init__.py b/app/accounting/models/__init__.py index 3a0dcd08..cd3d5bcc 100644 --- a/app/accounting/models/__init__.py +++ b/app/accounting/models/__init__.py @@ -1 +1 @@ -from .asset_base_history import AssetBaseHistory +from .asset_base_history import AssetBaseHistory # pylint: disable=W0611:unused-import diff --git a/app/accounting/models/asset_base.py b/app/accounting/models/asset_base.py index d58da083..82d7956e 100644 --- a/app/accounting/models/asset_base.py +++ b/app/accounting/models/asset_base.py @@ -6,8 +6,6 @@ from rest_framework.reverse import reverse from access.fields import AutoCreatedField, AutoLastModifiedField from access.models.tenancy import TenancyObject -from core.lib.feature_not_used import FeatureNotUsed - class AssetBase( @@ -257,7 +255,6 @@ class AssetBase( ): return related_object.name - break return '' diff --git a/app/api/models/__init__.py b/app/api/models/__init__.py index 6d1aea54..1722d235 100644 --- a/app/api/models/__init__.py +++ b/app/api/models/__init__.py @@ -1 +1 @@ -from . import tokens \ No newline at end of file +from . import tokens # pylint: disable=W0611:unused-import \ No newline at end of file diff --git a/app/api/react_ui_metadata.py b/app/api/react_ui_metadata.py index 4362b1cf..028ac836 100644 --- a/app/api/react_ui_metadata.py +++ b/app/api/react_ui_metadata.py @@ -3,11 +3,8 @@ import re from django.conf import settings from django.utils.encoding import force_str -from django.contrib.auth.models import ContentType, Permission - from rest_framework import serializers from rest_framework_json_api.metadata import JSONAPIMetadata -from rest_framework.request import clone_request from rest_framework.reverse import reverse from rest_framework.utils.field_mapping import ClassLookupDict diff --git a/app/api/serializers/access.py b/app/api/serializers/access.py index e2986a5f..d790d131 100644 --- a/app/api/serializers/access.py +++ b/app/api/serializers/access.py @@ -1,4 +1,4 @@ -from rest_framework import serializers, request +from rest_framework import serializers from rest_framework.reverse import reverse from access.models.tenant import Tenant as Organization diff --git a/app/api/serializers/common.py b/app/api/serializers/common.py index 0cbb83f6..d1334b2c 100644 --- a/app/api/serializers/common.py +++ b/app/api/serializers/common.py @@ -4,8 +4,6 @@ from rest_framework.reverse import reverse from access.serializers.organization import Tenant -from assistance.models.model_knowledge_base_article import all_models - from core import fields as centurion_field from core.lib.feature_not_used import FeatureNotUsed diff --git a/app/api/serializers/core/ticket.py b/app/api/serializers/core/ticket.py index f8f43e7f..2214f895 100644 --- a/app/api/serializers/core/ticket.py +++ b/app/api/serializers/core/ticket.py @@ -3,8 +3,6 @@ from django.urls import reverse from rest_framework import serializers from rest_framework.fields import empty -from api.serializers.core.ticket_comment import TicketCommentSerializer - from core import exceptions as centurion_exception from core.forms.validate_ticket import TicketValidation from core.models.ticket.ticket import Ticket diff --git a/app/api/serializers/core/ticket_category.py b/app/api/serializers/core/ticket_category.py index 5c14ce62..8bcfb503 100644 --- a/app/api/serializers/core/ticket_category.py +++ b/app/api/serializers/core/ticket_category.py @@ -1,11 +1,6 @@ -from django.urls import reverse - from rest_framework import serializers from rest_framework.fields import empty -from api.serializers.core.ticket_comment import TicketCommentSerializer - -from core.forms.validate_ticket import TicketValidation from core.models.ticket.ticket_category import TicketCategory diff --git a/app/api/serializers/core/ticket_comment_category.py b/app/api/serializers/core/ticket_comment_category.py index 82a51c21..53cdbcc5 100644 --- a/app/api/serializers/core/ticket_comment_category.py +++ b/app/api/serializers/core/ticket_comment_category.py @@ -1,5 +1,3 @@ -from django.urls import reverse - from rest_framework import serializers from rest_framework.fields import empty diff --git a/app/api/serializers/itam/device.py b/app/api/serializers/itam/device.py index d3ce38cd..e9c990ae 100644 --- a/app/api/serializers/itam/device.py +++ b/app/api/serializers/itam/device.py @@ -2,8 +2,6 @@ from django.urls import reverse from rest_framework import serializers -from api.serializers.config import ParentGroupSerializer - from config_management.models.groups import ConfigGroups from itam.models.device import Device diff --git a/app/api/serializers/itam/inventory.py b/app/api/serializers/itam/inventory.py index 66c35dd3..039e16fa 100644 --- a/app/api/serializers/itam/inventory.py +++ b/app/api/serializers/itam/inventory.py @@ -1,6 +1,3 @@ -from django.urls import reverse - -from itam.models.device import Device from rest_framework import serializers diff --git a/app/api/serializers/project_management/project_state.py b/app/api/serializers/project_management/project_state.py index e1c96184..e6457a0a 100644 --- a/app/api/serializers/project_management/project_state.py +++ b/app/api/serializers/project_management/project_state.py @@ -1,5 +1,3 @@ -from django.urls import reverse - from rest_framework import serializers from rest_framework.fields import empty diff --git a/app/api/serializers/project_management/project_type.py b/app/api/serializers/project_management/project_type.py index 55101baa..d1be19b7 100644 --- a/app/api/serializers/project_management/project_type.py +++ b/app/api/serializers/project_management/project_type.py @@ -1,5 +1,3 @@ -from django.urls import reverse - from rest_framework import serializers from rest_framework.fields import empty diff --git a/app/api/serializers/project_management/projects.py b/app/api/serializers/project_management/projects.py index 2250897f..02a1243a 100644 --- a/app/api/serializers/project_management/projects.py +++ b/app/api/serializers/project_management/projects.py @@ -1,7 +1,6 @@ from django.urls import reverse from rest_framework import serializers -from rest_framework.fields import empty from project_management.models.projects import Project diff --git a/app/api/viewsets/common.py b/app/api/viewsets/common.py index 03edde97..d051cb7a 100644 --- a/app/api/viewsets/common.py +++ b/app/api/viewsets/common.py @@ -12,7 +12,6 @@ from rest_framework.response import Response from access.mixins.organization import OrganizationMixin from access.mixins.permissions import OrganizationPermissionMixin -from api.auth import TokenScheme from api.react_ui_metadata import ReactUIMetadata diff --git a/app/assistance/models/knowledge_base.py b/app/assistance/models/knowledge_base.py index 046e4af8..19704c12 100644 --- a/app/assistance/models/knowledge_base.py +++ b/app/assistance/models/knowledge_base.py @@ -1,6 +1,5 @@ import django from django.db import models -from django.forms import ValidationError from access.fields import * from access.models.team import Team diff --git a/app/assistance/models/model_knowledge_base_article.py b/app/assistance/models/model_knowledge_base_article.py index e2d45b6c..f876923b 100644 --- a/app/assistance/models/model_knowledge_base_article.py +++ b/app/assistance/models/model_knowledge_base_article.py @@ -2,9 +2,6 @@ import importlib from django.apps import apps from django.db import models -from django.forms import ValidationError - -from rest_framework.reverse import reverse from access.fields import * from access.models.tenancy import TenancyObject diff --git a/app/assistance/serializers/knowledge_base_category.py b/app/assistance/serializers/knowledge_base_category.py index 747a3e35..5f3c9366 100644 --- a/app/assistance/serializers/knowledge_base_category.py +++ b/app/assistance/serializers/knowledge_base_category.py @@ -1,7 +1,7 @@ from rest_framework.reverse import reverse from rest_framework import serializers -from rest_framework.exceptions import ParseError, ValidationError +from rest_framework.exceptions import ValidationError from access.serializers.organization import TenantBaseSerializer diff --git a/app/assistance/serializers/knowledge_base_category_notes.py b/app/assistance/serializers/knowledge_base_category_notes.py index ce69a1c1..83e98d30 100644 --- a/app/assistance/serializers/knowledge_base_category_notes.py +++ b/app/assistance/serializers/knowledge_base_category_notes.py @@ -1,13 +1,6 @@ -from rest_framework import serializers - -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from assistance.models.knowledge_base_category_notes import KnowledgeCategoryBaseNotes from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/assistance/serializers/knowledge_base_notes.py b/app/assistance/serializers/knowledge_base_notes.py index 9eeb42f8..a323f3b5 100644 --- a/app/assistance/serializers/knowledge_base_notes.py +++ b/app/assistance/serializers/knowledge_base_notes.py @@ -1,13 +1,6 @@ -from rest_framework import serializers - from assistance.models.knowledge_base_notes import KnowledgeBaseNotes -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/assistance/serializers/model_knowledge_base_article.py b/app/assistance/serializers/model_knowledge_base_article.py index 75b6ec35..616ef2ac 100644 --- a/app/assistance/serializers/model_knowledge_base_article.py +++ b/app/assistance/serializers/model_knowledge_base_article.py @@ -1,7 +1,4 @@ -from django.apps import apps - from rest_framework import serializers -from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer diff --git a/app/assistance/serializers/request.py b/app/assistance/serializers/request.py index 67e69202..d11086b3 100644 --- a/app/assistance/serializers/request.py +++ b/app/assistance/serializers/request.py @@ -1,7 +1,5 @@ from rest_framework import serializers -from centurion.serializers.user import UserBaseSerializer - from core.models.ticket.ticket_category import TicketCategory from core.serializers.ticket_depreciated import ( Ticket, diff --git a/app/assistance/viewsets/knowledge_base.py b/app/assistance/viewsets/knowledge_base.py index 995da28e..5dd3248b 100644 --- a/app/assistance/viewsets/knowledge_base.py +++ b/app/assistance/viewsets/knowledge_base.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelViewSet -from assistance.serializers.knowledge_base import ( +from assistance.serializers.knowledge_base import ( # pylint: disable=W0611:unused-import KnowledgeBase, KnowledgeBaseModelSerializer, KnowledgeBaseViewSerializer diff --git a/app/assistance/viewsets/knowledge_base_category.py b/app/assistance/viewsets/knowledge_base_category.py index e16497bf..b2abbca1 100644 --- a/app/assistance/viewsets/knowledge_base_category.py +++ b/app/assistance/viewsets/knowledge_base_category.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelViewSet -from assistance.serializers.knowledge_base_category import ( +from assistance.serializers.knowledge_base_category import ( # pylint: disable=W0611:unused-import KnowledgeBaseCategory, KnowledgeBaseCategoryModelSerializer, KnowledgeBaseCategoryViewSerializer diff --git a/app/assistance/viewsets/model_knowledge_base_article.py b/app/assistance/viewsets/model_knowledge_base_article.py index 0e8da25c..1dfe5b20 100644 --- a/app/assistance/viewsets/model_knowledge_base_article.py +++ b/app/assistance/viewsets/model_knowledge_base_article.py @@ -4,7 +4,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelViewSet -from assistance.serializers.model_knowledge_base_article import ( +from assistance.serializers.model_knowledge_base_article import ( # pylint: disable=W0611:unused-import all_models, ModelKnowledgeBaseArticle, ModelKnowledgeBaseArticleModelSerializer, diff --git a/app/assistance/viewsets/request.py b/app/assistance/viewsets/request.py index 2e3d91ef..07dd7793 100644 --- a/app/assistance/viewsets/request.py +++ b/app/assistance/viewsets/request.py @@ -5,7 +5,7 @@ from drf_spectacular.utils import ( PolymorphicProxySerializer, ) -from assistance.serializers.request import ( +from assistance.serializers.request import ( # pylint: disable=W0611:unused-import RequestAddTicketModelSerializer, RequestChangeTicketModelSerializer, RequestTriageTicketModelSerializer, @@ -16,8 +16,6 @@ from assistance.serializers.request import ( from core.viewsets.ticket_depreciated import TicketViewSet -from settings.models.user_settings import UserSettings - @extend_schema_view( diff --git a/app/centurion_feature_flag/urls/django.py b/app/centurion_feature_flag/urls/django.py index f4274a05..ec2e6207 100644 --- a/app/centurion_feature_flag/urls/django.py +++ b/app/centurion_feature_flag/urls/django.py @@ -1,6 +1,6 @@ -from django.urls.conf import ( +from django.urls.conf import ( # pylint: disable=W0611:unused-import _path as _django_path, - include, # pylint: disable=W0611:unused-import + include, partial, RegexPattern as DjangoRegexPattern, RoutePattern as DjangoRoutePattern, diff --git a/app/centurion_feature_flag/views/disabled.py b/app/centurion_feature_flag/views/disabled.py index 76079589..3fa3df61 100644 --- a/app/centurion_feature_flag/views/disabled.py +++ b/app/centurion_feature_flag/views/disabled.py @@ -1,4 +1,4 @@ -from django.shortcuts import Http404, HttpResponse #, redirect, render +from django.shortcuts import Http404 from django.views.generic import View diff --git a/app/config_management/serializers/config_group.py b/app/config_management/serializers/config_group.py index 9f8c8712..15a482b3 100644 --- a/app/config_management/serializers/config_group.py +++ b/app/config_management/serializers/config_group.py @@ -1,5 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer diff --git a/app/config_management/serializers/config_group_notes.py b/app/config_management/serializers/config_group_notes.py index bb07209c..54d572aa 100644 --- a/app/config_management/serializers/config_group_notes.py +++ b/app/config_management/serializers/config_group_notes.py @@ -1,11 +1,4 @@ -from rest_framework import serializers - -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/config_management/serializers/config_group_software.py b/app/config_management/serializers/config_group_software.py index 9cd991a5..19d9af14 100644 --- a/app/config_management/serializers/config_group_software.py +++ b/app/config_management/serializers/config_group_software.py @@ -1,5 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer diff --git a/app/config_management/viewsets/config_group.py b/app/config_management/viewsets/config_group.py index d7e420bc..eb68ebdc 100644 --- a/app/config_management/viewsets/config_group.py +++ b/app/config_management/viewsets/config_group.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelViewSet -from config_management.serializers.config_group import ( +from config_management.serializers.config_group import ( # pylint: disable=W0611:unused-import ConfigGroups, ConfigGroupModelSerializer, ConfigGroupViewSerializer diff --git a/app/config_management/viewsets/config_group_software.py b/app/config_management/viewsets/config_group_software.py index 4eaa4447..e76468d6 100644 --- a/app/config_management/viewsets/config_group_software.py +++ b/app/config_management/viewsets/config_group_software.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelViewSet -from config_management.serializers.config_group_software import ( +from config_management.serializers.config_group_software import ( # pylint: disable=W0611:unused-import ConfigGroupSoftware, ConfigGroupSoftwareModelSerializer, ConfigGroupSoftwareViewSerializer diff --git a/app/core/exceptions.py b/app/core/exceptions.py index baf6a27f..8ccbf8dc 100644 --- a/app/core/exceptions.py +++ b/app/core/exceptions.py @@ -1,11 +1,11 @@ -from django.core.exceptions import ( +from django.core.exceptions import ( # pylint: disable=W0611:unused-import ObjectDoesNotExist ) -from django.http import Http404 +from django.http import Http404 # pylint: disable=W0611:unused-import from rest_framework import exceptions, status -from rest_framework.exceptions import ( +from rest_framework.exceptions import ( # pylint: disable=W0611:unused-import MethodNotAllowed, NotFound, NotAuthenticated, diff --git a/app/core/fields/__init__.py b/app/core/fields/__init__.py index 8bd32f5f..e59ab93c 100644 --- a/app/core/fields/__init__.py +++ b/app/core/fields/__init__.py @@ -1,2 +1,2 @@ -from .char import CharField -from .markdown import MarkdownField \ No newline at end of file +from .char import CharField # pylint: disable=W0611:unused-import +from .markdown import MarkdownField # pylint: disable=W0611:unused-import \ No newline at end of file diff --git a/app/core/fields/badge.py b/app/core/fields/badge.py index c1ce6cff..eb18826b 100644 --- a/app/core/fields/badge.py +++ b/app/core/fields/badge.py @@ -3,8 +3,6 @@ from rest_framework.fields import empty from core.classes.badge import Badge -from core.fields.icon import Icon, IconField - class BadgeField(serializers.DictField): diff --git a/app/core/fields/markdown.py b/app/core/fields/markdown.py index 779fb288..25e3bd25 100644 --- a/app/core/fields/markdown.py +++ b/app/core/fields/markdown.py @@ -1,5 +1,3 @@ -from rest_framework import serializers - from core.fields import CharField diff --git a/app/core/lib/markdown_plugins/model_reference.py b/app/core/lib/markdown_plugins/model_reference.py index c30cc551..6704c6dc 100644 --- a/app/core/lib/markdown_plugins/model_reference.py +++ b/app/core/lib/markdown_plugins/model_reference.py @@ -2,7 +2,6 @@ import re from django.template import Context, Template -from django.template.loader import render_to_string from django.urls import reverse from markdown_it import MarkdownIt diff --git a/app/core/lib/slash_commands/duration.py b/app/core/lib/slash_commands/duration.py index bef64060..f3396bd9 100644 --- a/app/core/lib/slash_commands/duration.py +++ b/app/core/lib/slash_commands/duration.py @@ -1,4 +1,4 @@ -import re + class Duration: diff --git a/app/core/management/commands/manufacturer.py b/app/core/management/commands/manufacturer.py index a0adcaf8..cda2eee0 100644 --- a/app/core/management/commands/manufacturer.py +++ b/app/core/management/commands/manufacturer.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand from django.db.models import Q -from django.utils import timezone from core.models.manufacturer import Manufacturer diff --git a/app/core/models/__init__.py b/app/core/models/__init__.py index 92b51546..a7b5542c 100644 --- a/app/core/models/__init__.py +++ b/app/core/models/__init__.py @@ -1,4 +1,4 @@ -from .history import History -from . import ticket_comment_action -from . import ticket_comment_base -from . import ticket_comment_solution +from .history import History # pylint: disable=W0611:unused-import +from . import ticket_comment_action # pylint: disable=W0611:unused-import +from . import ticket_comment_base # pylint: disable=W0611:unused-import +from . import ticket_comment_solution # pylint: disable=W0611:unused-import diff --git a/app/core/models/model_history.py b/app/core/models/model_history.py index 4709ee34..fe954858 100644 --- a/app/core/models/model_history.py +++ b/app/core/models/model_history.py @@ -1,3 +1,3 @@ -from core.models.audit import ( +from core.models.audit import ( # pylint: disable=W0611:unused-import ModelHistory ) diff --git a/app/core/models/model_notes.py b/app/core/models/model_notes.py index c04cb6fd..1b72bc85 100644 --- a/app/core/models/model_notes.py +++ b/app/core/models/model_notes.py @@ -4,21 +4,11 @@ from django.conf import settings from django.contrib.auth.models import ContentType from django.db import models -from rest_framework.reverse import reverse - from access.fields import * from access.models.tenancy import TenancyObject -from config_management.models.groups import ConfigGroups - from core.lib.feature_not_used import FeatureNotUsed -from itam.models.device import Device -from itam.models.software import Software -from itam.models.operating_system import OperatingSystem - -from itim.models.services import Service - User = django.contrib.auth.get_user_model() diff --git a/app/core/models/ticket/ticket.py b/app/core/models/ticket/ticket.py index db5f6c36..862d3da8 100644 --- a/app/core/models/ticket/ticket.py +++ b/app/core/models/ticket/ticket.py @@ -18,7 +18,7 @@ from core import exceptions as centurion_exceptions from core.lib.feature_not_used import FeatureNotUsed from core.lib.slash_commands import SlashCommands from core.middleware.get_request import get_request -from core.models.ticket.ticket_category import TicketCategory, KnowledgeBase +from core.models.ticket.ticket_category import TicketCategory from project_management.models.project_milestone import Project, ProjectMilestone @@ -1529,12 +1529,6 @@ class RelatedTickets(TenancyObject): return FeatureNotUsed - def __str__(self): - - # return '#' + str( self.id ) - - return '#' - @property def parent_object(self): diff --git a/app/core/models/ticket/ticket_category.py b/app/core/models/ticket/ticket_category.py index f229ae66..cb5dfe28 100644 --- a/app/core/models/ticket/ticket_category.py +++ b/app/core/models/ticket/ticket_category.py @@ -1,7 +1,6 @@ from django.db import models from access.fields import AutoCreatedField, AutoLastModifiedField -from access.models.team import Team from access.models.tenancy import TenancyObject from assistance.models.knowledge_base import KnowledgeBase diff --git a/app/core/models/ticket/ticket_comment_category.py b/app/core/models/ticket/ticket_comment_category.py index b2d84aed..a0f387f2 100644 --- a/app/core/models/ticket/ticket_comment_category.py +++ b/app/core/models/ticket/ticket_comment_category.py @@ -1,7 +1,6 @@ from django.db import models from access.fields import AutoCreatedField, AutoLastModifiedField -from access.models.team import Team from access.models.tenancy import TenancyObject from assistance.models.knowledge_base import KnowledgeBase diff --git a/app/core/models/ticket/ticket_linked_items.py b/app/core/models/ticket/ticket_linked_items.py index 5b11e9fe..bd4a987a 100644 --- a/app/core/models/ticket/ticket_linked_items.py +++ b/app/core/models/ticket/ticket_linked_items.py @@ -5,13 +5,13 @@ from django.dispatch import receiver from rest_framework.reverse import reverse -from .ticket_enum_values import TicketValues - from access.models.tenancy import TenancyObject +from assistance.models.knowledge_base import KnowledgeBase + from core.lib.feature_not_used import FeatureNotUsed from core.middleware.get_request import get_request -from core.models.ticket.ticket import Ticket, KnowledgeBase +from core.models.ticket.ticket import Ticket deleted_model = dispatch.Signal() diff --git a/app/core/models/ticket_base.py b/app/core/models/ticket_base.py index 4f092e17..a2bc17fa 100644 --- a/app/core/models/ticket_base.py +++ b/app/core/models/ticket_base.py @@ -780,7 +780,6 @@ class TicketBase( ): return related_object.name - break return '' diff --git a/app/core/models/ticket_comment_action.py b/app/core/models/ticket_comment_action.py index 06aaccf9..62108d5d 100644 --- a/app/core/models/ticket_comment_action.py +++ b/app/core/models/ticket_comment_action.py @@ -1,7 +1,3 @@ -import datetime - - -from core import exceptions as centurion_exception from core.models.ticket_comment_base import TicketCommentBase diff --git a/app/core/models/ticket_comment_base.py b/app/core/models/ticket_comment_base.py index c5f2da83..6b6a081a 100644 --- a/app/core/models/ticket_comment_base.py +++ b/app/core/models/ticket_comment_base.py @@ -335,7 +335,6 @@ class TicketCommentBase( ): return related_object.name - break return '' diff --git a/app/core/serializers/celery_log.py b/app/core/serializers/celery_log.py index 8d74d6b5..d32f5625 100644 --- a/app/core/serializers/celery_log.py +++ b/app/core/serializers/celery_log.py @@ -1,14 +1,8 @@ -import json - from rest_framework.reverse import reverse from rest_framework import serializers from django_celery_results.models import TaskResult -from access.serializers.organization import TenantBaseSerializer - -from centurion.serializers.user import UserBaseSerializer - from core import fields as centurion_field diff --git a/app/core/serializers/manufacturer.py b/app/core/serializers/manufacturer.py index ac6ea78f..efb9d587 100644 --- a/app/core/serializers/manufacturer.py +++ b/app/core/serializers/manufacturer.py @@ -1,10 +1,7 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer -from centurion.serializers.user import UserBaseSerializer - from api.serializers import common from core.models.manufacturer import Manufacturer diff --git a/app/core/serializers/manufacturer_notes.py b/app/core/serializers/manufacturer_notes.py index 0339451d..8fa7186c 100644 --- a/app/core/serializers/manufacturer_notes.py +++ b/app/core/serializers/manufacturer_notes.py @@ -1,7 +1,6 @@ from core.models.manufacturer_notes import ManufacturerNotes from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/core/serializers/model_notes.py b/app/core/serializers/model_notes.py index 2b88bb2f..7ab899a1 100644 --- a/app/core/serializers/model_notes.py +++ b/app/core/serializers/model_notes.py @@ -1,5 +1,4 @@ from django.contrib.auth.models import ContentType -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer diff --git a/app/core/serializers/ticket_category.py b/app/core/serializers/ticket_category.py index 1533fbc8..fa492f67 100644 --- a/app/core/serializers/ticket_category.py +++ b/app/core/serializers/ticket_category.py @@ -1,4 +1,3 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer diff --git a/app/core/serializers/ticket_category_notes.py b/app/core/serializers/ticket_category_notes.py index 31e0c423..f948f346 100644 --- a/app/core/serializers/ticket_category_notes.py +++ b/app/core/serializers/ticket_category_notes.py @@ -1,7 +1,6 @@ from core.models.ticket.ticket_category_notes import TicketCategoryNotes from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/core/serializers/ticket_comment.py b/app/core/serializers/ticket_comment.py index 9d7e4f78..949dd9c0 100644 --- a/app/core/serializers/ticket_comment.py +++ b/app/core/serializers/ticket_comment.py @@ -1,5 +1,3 @@ -import datetime - from rest_framework.reverse import reverse from rest_framework import serializers diff --git a/app/core/serializers/ticket_comment_category.py b/app/core/serializers/ticket_comment_category.py index 2d40fef6..c6ce2f1a 100644 --- a/app/core/serializers/ticket_comment_category.py +++ b/app/core/serializers/ticket_comment_category.py @@ -1,10 +1,7 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer -from centurion.serializers.user import UserBaseSerializer - from api.serializers import common from core.models.ticket.ticket_comment_category import TicketCommentCategory diff --git a/app/core/serializers/ticket_comment_category_notes.py b/app/core/serializers/ticket_comment_category_notes.py index 1f254ff5..655c2711 100644 --- a/app/core/serializers/ticket_comment_category_notes.py +++ b/app/core/serializers/ticket_comment_category_notes.py @@ -1,7 +1,6 @@ from core.models.ticket.ticket_comment_category_notes import TicketCommentCategoryNotes from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/core/serializers/ticket_comment_depreciated.py b/app/core/serializers/ticket_comment_depreciated.py index 6b9fcb41..90504d9a 100644 --- a/app/core/serializers/ticket_comment_depreciated.py +++ b/app/core/serializers/ticket_comment_depreciated.py @@ -3,7 +3,7 @@ from rest_framework.reverse import reverse from rest_framework import serializers from rest_framework.fields import empty -from access.serializers.organization import Organization, TenantBaseSerializer +from access.serializers.organization import TenantBaseSerializer from access.serializers.teams import TeamBaseSerializer from api.serializers import common diff --git a/app/core/serializers/ticket_depreciated.py b/app/core/serializers/ticket_depreciated.py index b2d326a8..32addd8d 100644 --- a/app/core/serializers/ticket_depreciated.py +++ b/app/core/serializers/ticket_depreciated.py @@ -14,7 +14,7 @@ from core import exceptions as centurion_exception from core import fields as centurion_field from core.models.ticket.ticket import Ticket -from core.fields.badge import Badge, BadgeField +from core.fields.badge import BadgeField from core.serializers.ticket_category import TicketCategoryBaseSerializer from project_management.serializers.project import ProjectBaseSerializer @@ -232,11 +232,10 @@ class TicketModelSerializer( if self.instance.project is None: raise centurion_exception.ValidationError( - details = 'Milestones require a project', + detail = 'Milestones require a project', code = 'milestone_requires_project', ) - return False if self.instance.project.id == self.instance.milestone.project.id: diff --git a/app/core/serializers/ticket_linked_item.py b/app/core/serializers/ticket_linked_item.py index db512e90..55b3009f 100644 --- a/app/core/serializers/ticket_linked_item.py +++ b/app/core/serializers/ticket_linked_item.py @@ -1,5 +1,3 @@ -from rest_framework.fields import empty -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer @@ -7,7 +5,6 @@ from access.serializers.organization import TenantBaseSerializer from assistance.serializers.request import TicketBaseSerializer from core import fields as centurion_field -from core.fields.badge import BadgeField from core.models.ticket.ticket import Ticket from core.models.ticket.ticket_linked_items import TicketLinkedItem diff --git a/app/core/serializers/ticket_related.py b/app/core/serializers/ticket_related.py index ff61cb91..1418b089 100644 --- a/app/core/serializers/ticket_related.py +++ b/app/core/serializers/ticket_related.py @@ -1,12 +1,10 @@ -from rest_framework.fields import empty -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from core.serializers.ticket_depreciated import Ticket, TicketBaseSerializer +from core.serializers.ticket_depreciated import TicketBaseSerializer from core import exceptions as centurion_exceptions from core import fields as centurion_field diff --git a/app/core/tests/functional/related_ticket/test_related_ticket_serializer.py b/app/core/tests/functional/related_ticket/test_related_ticket_serializer.py index 36b47d3a..0647eaf3 100644 --- a/app/core/tests/functional/related_ticket/test_related_ticket_serializer.py +++ b/app/core/tests/functional/related_ticket/test_related_ticket_serializer.py @@ -9,8 +9,8 @@ from access.models.tenant import Tenant as Organization from centurion.tests.abstract.mock_view import MockView +from core.models.ticket.ticket import Ticket from core.serializers.ticket_related import ( - Ticket, RelatedTickets, RelatedTicketModelSerializer, ) diff --git a/app/core/viewsets/celery_log.py b/app/core/viewsets/celery_log.py index 0e885156..c9c1fa54 100644 --- a/app/core/viewsets/celery_log.py +++ b/app/core/viewsets/celery_log.py @@ -1,6 +1,6 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse -from core.serializers.celery_log import ( +from core.serializers.celery_log import ( # pylint: disable=W0611:unused-import TaskResult, TaskResultModelSerializer, TaskResultViewSerializer diff --git a/app/core/viewsets/manufacturer.py b/app/core/viewsets/manufacturer.py index a8d01c70..f109a5d7 100644 --- a/app/core/viewsets/manufacturer.py +++ b/app/core/viewsets/manufacturer.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from core.models.manufacturer_history import ManufacturerHistory # pylint: disable=W0611:unused-import -from core.serializers.manufacturer import ( +from core.serializers.manufacturer import ( # pylint: disable=W0611:unused-import Manufacturer, ManufacturerModelSerializer, ManufacturerViewSerializer diff --git a/app/core/viewsets/model_notes.py b/app/core/viewsets/model_notes.py index 97cf23c2..15930a38 100644 --- a/app/core/viewsets/model_notes.py +++ b/app/core/viewsets/model_notes.py @@ -1,8 +1,6 @@ from django.contrib.auth.models import ContentType -from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse - -from core.serializers.model_notes import ( +from core.serializers.model_notes import ( # pylint: disable=W0611:unused-import ModelNotes, ModelNoteModelSerializer, ModelNoteViewSerializer @@ -10,14 +8,6 @@ from core.serializers.model_notes import ( from api.viewsets.common import ModelViewSet -from config_management.models.groups import ConfigGroups - -from itam.models.device import Device -from itam.models.operating_system import OperatingSystem -from itam.models.software import Software - -from itim.models.services import Service - class ModelNoteViewSet(ModelViewSet): diff --git a/app/core/viewsets/related_ticket.py b/app/core/viewsets/related_ticket.py index 91b959dd..cffec6e6 100644 --- a/app/core/viewsets/related_ticket.py +++ b/app/core/viewsets/related_ticket.py @@ -2,12 +2,10 @@ from django.db.models import Q from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter, OpenApiResponse -from access.mixin import OrganizationMixin - from api.viewsets.common import ModelListRetrieveDeleteViewSet -from core.serializers.ticket_related import ( - Ticket, +from core.models.ticket.ticket import Ticket +from core.serializers.ticket_related import ( # pylint: disable=W0611:unused-import RelatedTickets, RelatedTicketModelSerializer, RelatedTicketViewSerializer, diff --git a/app/core/viewsets/ticket_category.py b/app/core/viewsets/ticket_category.py index 37ba580e..7f66da67 100644 --- a/app/core/viewsets/ticket_category.py +++ b/app/core/viewsets/ticket_category.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # THis import only exists so that the migrations can be created from core.models.ticket.ticket_category_history import TicketCategoryHistory # pylint: disable=W0611:unused-import -from core.serializers.ticket_category import ( +from core.serializers.ticket_category import ( # pylint: disable=W0611:unused-import TicketCategory, TicketCategoryModelSerializer, TicketCategoryViewSerializer diff --git a/app/core/viewsets/ticket_comment_category.py b/app/core/viewsets/ticket_comment_category.py index 24f273c3..760086ef 100644 --- a/app/core/viewsets/ticket_comment_category.py +++ b/app/core/viewsets/ticket_comment_category.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from core.models.ticket.ticket_comment_category_history import TicketCommentCategoryHistory # pylint: disable=W0611:unused-import -from core.serializers.ticket_comment_category import ( +from core.serializers.ticket_comment_category import ( # pylint: disable=W0611:unused-import TicketCommentCategory, TicketCommentCategoryModelSerializer, TicketCommentCategoryViewSerializer diff --git a/app/core/viewsets/ticket_comment_depreciated.py b/app/core/viewsets/ticket_comment_depreciated.py index 728b5492..7bb2b93c 100644 --- a/app/core/viewsets/ticket_comment_depreciated.py +++ b/app/core/viewsets/ticket_comment_depreciated.py @@ -1,18 +1,9 @@ -from django.db.models import Q -from django.shortcuts import get_object_or_404 - from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter, OpenApiResponse, PolymorphicProxySerializer -from rest_framework import generics, viewsets -from rest_framework.response import Response - -from access.mixin import OrganizationMixin - -from api.views.mixin import OrganizationPermissionAPI from api.viewsets.common import ModelViewSet from core import exceptions as centurion_exceptions -from core.serializers.ticket_comment_depreciated import ( +from core.serializers.ticket_comment_depreciated import ( # pylint: disable=W0611:unused-import Ticket, TicketComment, TicketCommentImportModelSerializer, @@ -35,8 +26,6 @@ from core.serializers.ticket_comment_depreciated import ( TicketCommentViewSerializer ) -from settings.models.user_settings import UserSettings - @extend_schema_view( diff --git a/app/core/viewsets/ticket_depreciated.py b/app/core/viewsets/ticket_depreciated.py index fc36d1a0..adfe167c 100644 --- a/app/core/viewsets/ticket_depreciated.py +++ b/app/core/viewsets/ticket_depreciated.py @@ -3,7 +3,7 @@ from api.viewsets.common import ModelViewSet from access.models.tenant import Tenant as Organization -from assistance.serializers.request import ( +from assistance.serializers.request import ( # pylint: disable=W0611:unused-import RequestAddTicketModelSerializer, RequestChangeTicketModelSerializer, RequestTriageTicketModelSerializer, @@ -16,7 +16,7 @@ from core.serializers.ticket_depreciated import ( Ticket, ) -from itim.serializers.change import ( +from itim.serializers.change import ( # pylint: disable=W0611:unused-import ChangeAddTicketModelSerializer, ChangeChangeTicketModelSerializer, ChangeImportTicketModelSerializer, @@ -25,7 +25,7 @@ from itim.serializers.change import ( ChangeTicketViewSerializer, ) -from itim.serializers.incident import ( +from itim.serializers.incident import ( # pylint: disable=W0611:unused-import IncidentAddTicketModelSerializer, IncidentChangeTicketModelSerializer, IncidentImportTicketModelSerializer, @@ -34,7 +34,7 @@ from itim.serializers.incident import ( IncidentTicketViewSerializer, ) -from itim.serializers.problem import ( +from itim.serializers.problem import ( # pylint: disable=W0611:unused-import ProblemAddTicketModelSerializer, ProblemChangeTicketModelSerializer, ProblemImportTicketModelSerializer, @@ -43,7 +43,7 @@ from itim.serializers.problem import ( ProblemTicketViewSerializer, ) -from project_management.serializers.project_task import ( +from project_management.serializers.project_task import ( # pylint: disable=W0611:unused-import ProjectTaskAddTicketModelSerializer, ProjectTaskChangeTicketModelSerializer, ProjectTaskImportTicketModelSerializer, @@ -52,8 +52,6 @@ from project_management.serializers.project_task import ( ProjectTaskTicketViewSerializer, ) -from settings.models.user_settings import UserSettings - class TicketViewSet(ModelViewSet): diff --git a/app/core/viewsets/ticket_linked_item.py b/app/core/viewsets/ticket_linked_item.py index 411e37f8..7cc856cb 100644 --- a/app/core/viewsets/ticket_linked_item.py +++ b/app/core/viewsets/ticket_linked_item.py @@ -1,6 +1,5 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter, OpenApiResponse -from api.views.mixin import OrganizationPermissionAPI from api.viewsets.common import ModelViewSet from assistance.models.knowledge_base import KnowledgeBase @@ -9,7 +8,7 @@ from config_management.models.groups import ConfigGroups from core.models.ticket.ticket_category import TicketCategory from core.models.ticket.ticket_comment_category import TicketCommentCategory -from core.serializers.ticket_linked_item import ( +from core.serializers.ticket_linked_item import ( # pylint: disable=W0611:unused-import Ticket, TicketLinkedItem, TicketLinkedItemModelSerializer, diff --git a/app/devops/models/__init__.py b/app/devops/models/__init__.py index 25d04e1c..414beb0a 100644 --- a/app/devops/models/__init__.py +++ b/app/devops/models/__init__.py @@ -1,5 +1,5 @@ -from . import check_ins -from . import git_group -from . import git_repository -from . import feature_flag -from . import software_enable_feature_flag \ No newline at end of file +from . import check_ins # pylint: disable=W0611:unused-import +from . import git_group # pylint: disable=W0611:unused-import +from . import git_repository # pylint: disable=W0611:unused-import +from . import feature_flag # pylint: disable=W0611:unused-import +from . import software_enable_feature_flag # pylint: disable=W0611:unused-import \ No newline at end of file diff --git a/app/devops/models/git_repository/__init__.py b/app/devops/models/git_repository/__init__.py index c201b515..0b047972 100644 --- a/app/devops/models/git_repository/__init__.py +++ b/app/devops/models/git_repository/__init__.py @@ -1,2 +1,2 @@ -from . import github -from . import gitlab \ No newline at end of file +from . import github # pylint: disable=W0611:unused-import +from . import gitlab # pylint: disable=W0611:unused-import \ No newline at end of file diff --git a/app/devops/models/software_enable_feature_flag.py b/app/devops/models/software_enable_feature_flag.py index c4d82049..8c5804bd 100644 --- a/app/devops/models/software_enable_feature_flag.py +++ b/app/devops/models/software_enable_feature_flag.py @@ -1,6 +1,6 @@ import pytz -from datetime import date, datetime +from datetime import datetime from django.db import models diff --git a/app/devops/serializers/git_repository/base.py b/app/devops/serializers/git_repository/base.py index cd626429..25be8e9f 100644 --- a/app/devops/serializers/git_repository/base.py +++ b/app/devops/serializers/git_repository/base.py @@ -8,7 +8,7 @@ from api.serializers import common from core.fields.badge import BadgeField -from devops.models.git_repository.base import GitRepository, GitGroup +from devops.models.git_repository.base import GitRepository from devops.serializers.git_group import BaseSerializer as GitGroupBaseSerializer diff --git a/app/devops/serializers/git_repository/github.py b/app/devops/serializers/git_repository/github.py index 142d5ede..104e2b44 100644 --- a/app/devops/serializers/git_repository/github.py +++ b/app/devops/serializers/git_repository/github.py @@ -2,11 +2,9 @@ from drf_spectacular.utils import extend_schema_serializer from rest_framework import serializers -from api.serializers import common - from devops.models.git_group import GitGroup from devops.models.git_repository.github import GitHubRepository -from devops.serializers.git_repository.base import ( +from devops.serializers.git_repository.base import ( # pylint: disable=W0611:unused-import BaseSerializer, ModelSerializer as GitModelSerializer, ViewSerializer as GitViewSerializer diff --git a/app/devops/serializers/git_repository/gitlab.py b/app/devops/serializers/git_repository/gitlab.py index 0becf804..ddaa980e 100644 --- a/app/devops/serializers/git_repository/gitlab.py +++ b/app/devops/serializers/git_repository/gitlab.py @@ -2,15 +2,9 @@ from drf_spectacular.utils import extend_schema_serializer from rest_framework import serializers -from access.serializers.organization import TenantBaseSerializer - -from api.serializers import common - -from core import exceptions as centurion_exceptions - from devops.models.git_group import GitGroup from devops.models.git_repository.gitlab import GitLabRepository -from devops.serializers.git_repository.base import ( +from devops.serializers.git_repository.base import ( # pylint: disable=W0611:unused-import BaseSerializer, ModelSerializer as GitModelSerializer, ViewSerializer as GitViewSerializer diff --git a/app/devops/tests/unit/feature_flag/test_unit_feature_flag_history_api_v2.py b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_history_api_v2.py index 650a0201..6a1ebcf7 100644 --- a/app/devops/tests/unit/feature_flag/test_unit_feature_flag_history_api_v2.py +++ b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_history_api_v2.py @@ -1,7 +1,6 @@ from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from core.models.manufacturer_history import Manufacturer, ManufacturerHistory from core.tests.abstract.test_unit_model_history_api_v2 import PrimaryModelHistoryAPI from devops.models.feature_flag_history import FeatureFlag, FeatureFlagHistory diff --git a/app/devops/urls_public.py b/app/devops/urls_public.py index 0681695d..3d62c9cd 100644 --- a/app/devops/urls_public.py +++ b/app/devops/urls_public.py @@ -1,4 +1,4 @@ -from rest_framework.routers import DefaultRouter, SimpleRouter +from rest_framework.routers import SimpleRouter from devops.viewsets import ( feature_flag_endpoints, diff --git a/app/devops/viewsets/git_repository.py b/app/devops/viewsets/git_repository.py index 82fcfc22..70781ac6 100644 --- a/app/devops/viewsets/git_repository.py +++ b/app/devops/viewsets/git_repository.py @@ -12,7 +12,7 @@ from drf_spectacular.utils import ( from devops.models.git_repository.github_history import GitHubHistory # pylint: disable=W0611:unused-import from devops.models.git_repository.gitlab_history import GitlabHistory # pylint: disable=W0611:unused-import from devops.models.git_group import GitGroup -from devops.serializers.git_repository.base import ( +from devops.serializers.git_repository.base import ( # pylint: disable=W0611:unused-import GitRepository, ModelSerializer, ViewSerializer, diff --git a/app/human_resources/models/__init__.py b/app/human_resources/models/__init__.py index f7b5da31..6172ecb9 100644 --- a/app/human_resources/models/__init__.py +++ b/app/human_resources/models/__init__.py @@ -1 +1 @@ -from . import employee +from . import employee # pylint: disable=W0611:unused-import diff --git a/app/itam/models/__init__.py b/app/itam/models/__init__.py index 624d775f..fe66c0be 100644 --- a/app/itam/models/__init__.py +++ b/app/itam/models/__init__.py @@ -1,2 +1,2 @@ -from .device_software_history import DeviceSoftwareHistory -from .itam_asset_base import ITAMAssetBase +from .device_software_history import DeviceSoftwareHistory # pylint: disable=W0611:unused-import +from .itam_asset_base import ITAMAssetBase # pylint: disable=W0611:unused-import diff --git a/app/itam/models/device.py b/app/itam/models/device.py index b3a09ac1..a23c4568 100644 --- a/app/itam/models/device.py +++ b/app/itam/models/device.py @@ -9,10 +9,8 @@ from django.dispatch import receiver from django.forms import ValidationError from rest_framework import serializers -from rest_framework.reverse import reverse from access.fields import * -from access.models.tenancy import TenancyObject from centurion.helpers.merge_software import merge_software diff --git a/app/itam/models/device_models.py b/app/itam/models/device_models.py index 24383f76..6ca7cec4 100644 --- a/app/itam/models/device_models.py +++ b/app/itam/models/device_models.py @@ -2,8 +2,6 @@ from django.db import models from itam.models.device_common import DeviceCommonFieldsName -from access.models.tenancy import TenancyObject - from core.mixin.history_save import SaveHistory from core.models.manufacturer import Manufacturer diff --git a/app/itam/serializers/device.py b/app/itam/serializers/device.py index 28217d21..d8807c3b 100644 --- a/app/itam/serializers/device.py +++ b/app/itam/serializers/device.py @@ -1,16 +1,13 @@ import json -from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse - from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from api.viewsets.common import ModelViewSet -from core.fields.icon import Icon, IconField +from core.fields.icon import IconField from itam.models.device import Device from itam.serializers.device_model import DeviceModelBaseSerializer diff --git a/app/itam/serializers/device_model.py b/app/itam/serializers/device_model.py index 84276aef..8b1a3d19 100644 --- a/app/itam/serializers/device_model.py +++ b/app/itam/serializers/device_model.py @@ -1,5 +1,3 @@ -from rest_framework.reverse import reverse - from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer diff --git a/app/itam/serializers/device_model_notes.py b/app/itam/serializers/device_model_notes.py index e226bae7..bd26593a 100644 --- a/app/itam/serializers/device_model_notes.py +++ b/app/itam/serializers/device_model_notes.py @@ -1,7 +1,4 @@ -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/device_notes.py b/app/itam/serializers/device_notes.py index 6d0e9165..cf269238 100644 --- a/app/itam/serializers/device_notes.py +++ b/app/itam/serializers/device_notes.py @@ -1,14 +1,4 @@ -from rest_framework.reverse import reverse -from rest_framework import serializers - -from access.serializers.organization import TenantBaseSerializer - -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer @@ -17,7 +7,6 @@ from core.serializers.model_notes import ( from itam.models.device_notes import ( DeviceNotes ) -from itam.serializers.device import DeviceBaseSerializer diff --git a/app/itam/serializers/device_operating_system.py b/app/itam/serializers/device_operating_system.py index 64f3f266..cb887e23 100644 --- a/app/itam/serializers/device_operating_system.py +++ b/app/itam/serializers/device_operating_system.py @@ -1,5 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer @@ -7,11 +6,10 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common from core import exceptions as centurion_exception -from core.fields.badge import Badge, BadgeField from itam.models.device import Device, DeviceOperatingSystem from itam.serializers.device import DeviceBaseSerializer -from itam.serializers.operating_system_version import OperatingSystem, OperatingSystemVersionBaseSerializer +from itam.serializers.operating_system_version import OperatingSystemVersionBaseSerializer diff --git a/app/itam/serializers/device_software.py b/app/itam/serializers/device_software.py index 3c51ac8f..68bd0555 100644 --- a/app/itam/serializers/device_software.py +++ b/app/itam/serializers/device_software.py @@ -1,5 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer @@ -7,7 +6,7 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common from core import exceptions as centurion_exception -from core.fields.badge import Badge, BadgeField +from core.fields.badge import BadgeField from itam.models.device import Device, DeviceSoftware from itam.serializers.device import DeviceBaseSerializer diff --git a/app/itam/serializers/device_type.py b/app/itam/serializers/device_type.py index c49b04f9..48c57718 100644 --- a/app/itam/serializers/device_type.py +++ b/app/itam/serializers/device_type.py @@ -1,4 +1,3 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer diff --git a/app/itam/serializers/device_type_notes.py b/app/itam/serializers/device_type_notes.py index 5d2d951a..197cc449 100644 --- a/app/itam/serializers/device_type_notes.py +++ b/app/itam/serializers/device_type_notes.py @@ -1,7 +1,4 @@ -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer @@ -10,7 +7,6 @@ from core.serializers.model_notes import ( from itam.models.device_type_notes import ( DeviceTypeNotes ) -from itam.serializers.device import DeviceBaseSerializer diff --git a/app/itam/serializers/inventory.py b/app/itam/serializers/inventory.py index 9d78b1e7..96a28953 100644 --- a/app/itam/serializers/inventory.py +++ b/app/itam/serializers/inventory.py @@ -1,5 +1,4 @@ from django.db.models import Q -from django.urls import reverse from rest_framework import serializers diff --git a/app/itam/serializers/operating_system_notes.py b/app/itam/serializers/operating_system_notes.py index c4af2897..37097772 100644 --- a/app/itam/serializers/operating_system_notes.py +++ b/app/itam/serializers/operating_system_notes.py @@ -1,8 +1,4 @@ - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/operating_system_version.py b/app/itam/serializers/operating_system_version.py index 76a929ca..ec752131 100644 --- a/app/itam/serializers/operating_system_version.py +++ b/app/itam/serializers/operating_system_version.py @@ -1,13 +1,9 @@ -from rest_framework.reverse import reverse - from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from core.serializers.manufacturer import ManufacturerBaseSerializer - from itam.models.operating_system import OperatingSystem, OperatingSystemVersion from itam.serializers.operating_system import OperatingSystemBaseSerializer diff --git a/app/itam/serializers/operating_system_version_notes.py b/app/itam/serializers/operating_system_version_notes.py index 41e547b1..d823630d 100644 --- a/app/itam/serializers/operating_system_version_notes.py +++ b/app/itam/serializers/operating_system_version_notes.py @@ -1,8 +1,4 @@ - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/software_category.py b/app/itam/serializers/software_category.py index c0aba9dd..71516aa8 100644 --- a/app/itam/serializers/software_category.py +++ b/app/itam/serializers/software_category.py @@ -1,12 +1,9 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from core.serializers.manufacturer import ManufacturerBaseSerializer - from itam.models.software import SoftwareCategory diff --git a/app/itam/serializers/software_category_notes.py b/app/itam/serializers/software_category_notes.py index ac7b804c..15fa3086 100644 --- a/app/itam/serializers/software_category_notes.py +++ b/app/itam/serializers/software_category_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/software_notes.py b/app/itam/serializers/software_notes.py index 9373fdf7..9222f66d 100644 --- a/app/itam/serializers/software_notes.py +++ b/app/itam/serializers/software_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/software_version_notes.py b/app/itam/serializers/software_version_notes.py index c7d4e860..04bca1ad 100644 --- a/app/itam/serializers/software_version_notes.py +++ b/app/itam/serializers/software_version_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/tasks/inventory.py b/app/itam/tasks/inventory.py index 5eed3b5f..1da154b1 100644 --- a/app/itam/tasks/inventory.py +++ b/app/itam/tasks/inventory.py @@ -3,15 +3,14 @@ import re from django.utils import timezone -from celery import shared_task, current_task +from celery import shared_task from celery.utils.log import get_task_logger -from celery import states from access.models.tenant import Tenant as Organization from itam.serializers.inventory import InventorySerializer -from itam.models.device import Device, DeviceType, DeviceOperatingSystem, DeviceSoftware +from itam.models.device import Device, DeviceOperatingSystem, DeviceSoftware from itam.models.operating_system import OperatingSystem, OperatingSystemVersion from itam.models.software import Software, SoftwareCategory, SoftwareVersion @@ -449,5 +448,3 @@ def process_inventory(self, data, organization: int): logger.critical('Exception') raise Exception(e) - - return str(f'Exception Occured: {e}') diff --git a/app/itam/urls.py b/app/itam/urls.py index e010dc8b..80f60386 100644 --- a/app/itam/urls.py +++ b/app/itam/urls.py @@ -1,7 +1,6 @@ from django.urls import path -from . import views -from .views import device, device_type, software, software_category, software_version, operating_system, operating_system_version +from .views import device, software, software_version, operating_system, operating_system_version app_name = "ITAM" urlpatterns = [ diff --git a/app/itam/viewsets/device.py b/app/itam/viewsets/device.py index 492cdbc6..217bd15d 100644 --- a/app/itam/viewsets/device.py +++ b/app/itam/viewsets/device.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelViewSet -from itam.serializers.device import ( +from itam.serializers.device import ( # pylint: disable=W0611:unused-import Device, DeviceModelSerializer, DeviceViewSerializer diff --git a/app/itam/viewsets/device_model.py b/app/itam/viewsets/device_model.py index 7070011e..0d161998 100644 --- a/app/itam/viewsets/device_model.py +++ b/app/itam/viewsets/device_model.py @@ -4,14 +4,12 @@ from api.viewsets.common import ModelViewSet # THis import only exists so that the migrations can be created from itam.models.device_model_history import DeviceModelHistory # pylint: disable=W0611:unused-import -from itam.serializers.device_model import ( +from itam.serializers.device_model import ( # pylint: disable=W0611:unused-import DeviceModel, DeviceModelModelSerializer, DeviceModelViewSerializer ) -from api.views.mixin import OrganizationPermissionAPI - @extend_schema_view( diff --git a/app/itam/viewsets/device_operating_system.py b/app/itam/viewsets/device_operating_system.py index 567cd0a2..efd10c76 100644 --- a/app/itam/viewsets/device_operating_system.py +++ b/app/itam/viewsets/device_operating_system.py @@ -1,29 +1,15 @@ -from django_filters.rest_framework import DjangoFilterBackend -from rest_framework import filters - -from django.db.models import Q -from django.shortcuts import get_object_or_404 - from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter, OpenApiResponse -from rest_framework.fields import empty -from rest_framework import generics, viewsets -from rest_framework.response import Response - -from access.mixin import OrganizationMixin - -from api.views.mixin import OrganizationPermissionAPI - from api.viewsets.common import ModelViewSet # THis import only exists so that the migrations can be created from itam.models.device_operating_system_history import DeviceOperatingSystemHistory # pylint: disable=W0611:unused-import -from itam.serializers.device_operating_system import ( +from itam.models.operating_system import OperatingSystem +from itam.serializers.device_operating_system import ( # pylint: disable=W0611:unused-import Device, DeviceOperatingSystem, DeviceOperatingSystemModelSerializer, DeviceOperatingSystemViewSerializer, - OperatingSystem, ) diff --git a/app/itam/viewsets/device_software.py b/app/itam/viewsets/device_software.py index 16e07972..424b58e9 100644 --- a/app/itam/viewsets/device_software.py +++ b/app/itam/viewsets/device_software.py @@ -1,22 +1,8 @@ -from django_filters.rest_framework import DjangoFilterBackend -from rest_framework import filters - -from django.db.models import Q -from django.shortcuts import get_object_or_404 - from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter, OpenApiResponse -from rest_framework.fields import empty -from rest_framework import generics, viewsets -from rest_framework.response import Response - -from access.mixin import OrganizationMixin - -from api.views.mixin import OrganizationPermissionAPI - from api.viewsets.common import ModelViewSet -from itam.serializers.device_software import ( +from itam.serializers.device_software import ( # pylint: disable=W0611:unused-import Device, DeviceSoftware, DeviceSoftwareModelSerializer, diff --git a/app/itam/viewsets/device_type.py b/app/itam/viewsets/device_type.py index d756332e..e70ed305 100644 --- a/app/itam/viewsets/device_type.py +++ b/app/itam/viewsets/device_type.py @@ -4,14 +4,12 @@ from api.viewsets.common import ModelViewSet # THis import only exists so that the migrations can be created from itam.models.device_type_history import DeviceTypeHistory # pylint: disable=W0611:unused-import -from itam.serializers.device_type import ( +from itam.serializers.device_type import ( # pylint: disable=W0611:unused-import DeviceType, DeviceTypeModelSerializer, DeviceTypeViewSerializer ) -from api.views.mixin import OrganizationPermissionAPI - @extend_schema_view( diff --git a/app/itam/viewsets/inventory.py b/app/itam/viewsets/inventory.py index 9b614693..1598510d 100644 --- a/app/itam/viewsets/inventory.py +++ b/app/itam/viewsets/inventory.py @@ -1,5 +1,3 @@ -import json - from django.db.models import Q from kombu.exceptions import OperationalError diff --git a/app/itam/viewsets/operating_system.py b/app/itam/viewsets/operating_system.py index b8b327d3..e8cfdf9d 100644 --- a/app/itam/viewsets/operating_system.py +++ b/app/itam/viewsets/operating_system.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from itam.models.operating_system_history import OperatingSystemHistory # pylint: disable=W0611:unused-import -from itam.serializers.operating_system import ( +from itam.serializers.operating_system import ( # pylint: disable=W0611:unused-import OperatingSystem, OperatingSystemModelSerializer, OperatingSystemViewSerializer diff --git a/app/itam/viewsets/operating_system_version.py b/app/itam/viewsets/operating_system_version.py index c7588f12..c88de1df 100644 --- a/app/itam/viewsets/operating_system_version.py +++ b/app/itam/viewsets/operating_system_version.py @@ -4,7 +4,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiPara # THis import only exists so that the migrations can be created from itam.models.operating_system_version_history import OperatingSystemVersionHistory # pylint: disable=W0611:unused-import -from itam.serializers.operating_system_version import ( +from itam.serializers.operating_system_version import ( # pylint: disable=W0611:unused-import OperatingSystem, OperatingSystemVersion, OperatingSystemVersionModelSerializer, diff --git a/app/itam/viewsets/software.py b/app/itam/viewsets/software.py index 28946531..4fa6930c 100644 --- a/app/itam/viewsets/software.py +++ b/app/itam/viewsets/software.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from itam.models.software_history import SoftwareHistory # pylint: disable=W0611:unused-import -from itam.serializers.software import ( +from itam.serializers.software import ( # pylint: disable=W0611:unused-import Software, SoftwareModelSerializer, SoftwareViewSerializer diff --git a/app/itam/viewsets/software_category.py b/app/itam/viewsets/software_category.py index 997e1fc3..114f31f6 100644 --- a/app/itam/viewsets/software_category.py +++ b/app/itam/viewsets/software_category.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from itam.models.software_category_history import SoftwareCategoryHistory # pylint: disable=W0611:unused-import -from itam.serializers.software_category import ( +from itam.serializers.software_category import ( # pylint: disable=W0611:unused-import SoftwareCategory, SoftwareCategoryModelSerializer, SoftwareCategoryViewSerializer diff --git a/app/itam/viewsets/software_version.py b/app/itam/viewsets/software_version.py index d1d3f7ca..4c7d4afc 100644 --- a/app/itam/viewsets/software_version.py +++ b/app/itam/viewsets/software_version.py @@ -4,7 +4,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiPara # THis import only exists so that the migrations can be created from itam.models.software_version_history import SoftwareVersionHistory # pylint: disable=W0611:unused-import -from itam.serializers.software_version import ( +from itam.serializers.software_version import ( # pylint: disable=W0611:unused-import Software, SoftwareVersion, SoftwareVersionModelSerializer, diff --git a/app/itim/models/__init__.py b/app/itim/models/__init__.py index 4e4192e8..045a6135 100644 --- a/app/itim/models/__init__.py +++ b/app/itim/models/__init__.py @@ -1,4 +1,4 @@ -from . import clusters -from . import services -from . import slm_ticket_base -from . import request_ticket +from . import clusters # pylint: disable=W0611:unused-import +from . import services # pylint: disable=W0611:unused-import +from . import slm_ticket_base # pylint: disable=W0611:unused-import +from . import request_ticket # pylint: disable=W0611:unused-import diff --git a/app/itim/models/clusters.py b/app/itim/models/clusters.py index dc9f6db8..b2ac111e 100644 --- a/app/itim/models/clusters.py +++ b/app/itim/models/clusters.py @@ -1,15 +1,12 @@ import json -from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_delete from django.dispatch import receiver -from django.forms import ValidationError from rest_framework.reverse import reverse from access.fields import * -from access.models.team import Team from access.models.tenancy import TenancyObject from core.signal.ticket_linked_item_delete import TicketLinkedItem, deleted_model diff --git a/app/itim/models/services.py b/app/itim/models/services.py index f17d26e1..96e2ff41 100644 --- a/app/itim/models/services.py +++ b/app/itim/models/services.py @@ -1,6 +1,5 @@ import re -from django.contrib.auth.models import User from django.db import models from django.db.models.signals import post_delete from django.dispatch import receiver @@ -9,15 +8,12 @@ from django.forms import ValidationError from rest_framework.reverse import reverse from access.fields import * -from access.models.team import Team from access.models.tenancy import TenancyObject from core.signal.ticket_linked_item_delete import TicketLinkedItem, deleted_model from itam.models.device import Device -from itim.models.clusters import Cluster - class Port(TenancyObject): diff --git a/app/itim/serializers/change.py b/app/itim/serializers/change.py index 49a646a4..3fd6892c 100644 --- a/app/itim/serializers/change.py +++ b/app/itim/serializers/change.py @@ -1,7 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty - -from centurion.serializers.user import UserBaseSerializer from core.models.ticket.ticket_category import TicketCategory from core.serializers.ticket_depreciated import ( diff --git a/app/itim/serializers/cluster_notes.py b/app/itim/serializers/cluster_notes.py index 3f5fbaff..0c528382 100644 --- a/app/itim/serializers/cluster_notes.py +++ b/app/itim/serializers/cluster_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itim/serializers/cluster_type.py b/app/itim/serializers/cluster_type.py index c3c56d88..eae6f004 100644 --- a/app/itim/serializers/cluster_type.py +++ b/app/itim/serializers/cluster_type.py @@ -1,12 +1,9 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from itam.serializers.device import DeviceBaseSerializer - from itim.models.clusters import ClusterType diff --git a/app/itim/serializers/cluster_type_notes.py b/app/itim/serializers/cluster_type_notes.py index 2589d2d4..7307e061 100644 --- a/app/itim/serializers/cluster_type_notes.py +++ b/app/itim/serializers/cluster_type_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itim/serializers/incident.py b/app/itim/serializers/incident.py index 9ea5c3db..cadbbab2 100644 --- a/app/itim/serializers/incident.py +++ b/app/itim/serializers/incident.py @@ -1,7 +1,5 @@ from rest_framework import serializers -from centurion.serializers.user import UserBaseSerializer - from core.models.ticket.ticket_category import TicketCategory from core.serializers.ticket_depreciated import ( Ticket, diff --git a/app/itim/serializers/port.py b/app/itim/serializers/port.py index 9817c536..2c59bf12 100644 --- a/app/itim/serializers/port.py +++ b/app/itim/serializers/port.py @@ -1,12 +1,9 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from itam.serializers.device import DeviceBaseSerializer - from itim.models.services import Port diff --git a/app/itim/serializers/port_notes.py b/app/itim/serializers/port_notes.py index d41233ff..5987702e 100644 --- a/app/itim/serializers/port_notes.py +++ b/app/itim/serializers/port_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itim/serializers/problem.py b/app/itim/serializers/problem.py index a5553d6d..1243dcc8 100644 --- a/app/itim/serializers/problem.py +++ b/app/itim/serializers/problem.py @@ -1,7 +1,5 @@ from rest_framework import serializers -from centurion.serializers.user import UserBaseSerializer - from core.models.ticket.ticket_category import TicketCategory from core.serializers.ticket_depreciated import ( Ticket, diff --git a/app/itim/serializers/service.py b/app/itim/serializers/service.py index a29865aa..2741bdce 100644 --- a/app/itim/serializers/service.py +++ b/app/itim/serializers/service.py @@ -1,4 +1,3 @@ -from rest_framework.fields import empty from rest_framework import serializers from rest_framework.reverse import reverse diff --git a/app/itim/serializers/service_notes.py b/app/itim/serializers/service_notes.py index 51b6c1a3..803f3dba 100644 --- a/app/itim/serializers/service_notes.py +++ b/app/itim/serializers/service_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itim/viewsets/cluster.py b/app/itim/viewsets/cluster.py index 0cc2b136..8b67c154 100644 --- a/app/itim/viewsets/cluster.py +++ b/app/itim/viewsets/cluster.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from itim.models.cluster_history import ClusterHistory # pylint: disable=W0611:unused-import -from itim.serializers.cluster import ( +from itim.serializers.cluster import ( # pylint: disable=W0611:unused-import Cluster, ClusterModelSerializer, ClusterViewSerializer diff --git a/app/itim/viewsets/cluster_type.py b/app/itim/viewsets/cluster_type.py index 1eb7e943..09f0eb04 100644 --- a/app/itim/viewsets/cluster_type.py +++ b/app/itim/viewsets/cluster_type.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from itim.models.cluster_type_history import ClusterTypeHistory # pylint: disable=W0611:unused-import -from itim.serializers.cluster_type import ( +from itim.serializers.cluster_type import ( # pylint: disable=W0611:unused-import ClusterType, ClusterTypeModelSerializer, ClusterTypeViewSerializer diff --git a/app/itim/viewsets/port.py b/app/itim/viewsets/port.py index 9d64a9f6..d2c4fb4a 100644 --- a/app/itim/viewsets/port.py +++ b/app/itim/viewsets/port.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from itim.models.port_history import PortHistory # pylint: disable=W0611:unused-import -from itim.serializers.port import ( +from itim.serializers.port import ( # pylint: disable=W0611:unused-import Port, PortModelSerializer, PortViewSerializer diff --git a/app/itim/viewsets/service.py b/app/itim/viewsets/service.py index 05efe11b..2ac50931 100644 --- a/app/itim/viewsets/service.py +++ b/app/itim/viewsets/service.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from itim.models.service_history import ServiceHistory # pylint: disable=W0611:unused-import -from itim.serializers.service import ( +from itim.serializers.service import ( # pylint: disable=W0611:unused-import Service, ServiceModelSerializer, ServiceViewSerializer diff --git a/app/itim/viewsets/service_cluster.py b/app/itim/viewsets/service_cluster.py index 5debb02f..dac78ecf 100644 --- a/app/itim/viewsets/service_cluster.py +++ b/app/itim/viewsets/service_cluster.py @@ -1,8 +1,8 @@ -from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse +from drf_spectacular.utils import extend_schema, extend_schema_view from api.viewsets.common import ReadOnlyModelViewSet -from itim.serializers.service import ( +from itim.serializers.service import ( # pylint: disable=W0611:unused-import Service, ServiceModelSerializer, ServiceViewSerializer diff --git a/app/itim/viewsets/service_device.py b/app/itim/viewsets/service_device.py index f3052cf5..4125e3b3 100644 --- a/app/itim/viewsets/service_device.py +++ b/app/itim/viewsets/service_device.py @@ -1,8 +1,8 @@ -from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse +from drf_spectacular.utils import extend_schema, extend_schema_view from api.viewsets.common import ReadOnlyModelViewSet -from itim.serializers.service import ( +from itim.serializers.service import ( # pylint: disable=W0611:unused-import Service, ServiceModelSerializer, ServiceViewSerializer diff --git a/app/project_management/models/project_milestone.py b/app/project_management/models/project_milestone.py index c804ef80..ff8d9a7e 100644 --- a/app/project_management/models/project_milestone.py +++ b/app/project_management/models/project_milestone.py @@ -2,7 +2,7 @@ from django.db import models from access.fields import AutoCreatedField -from .projects import Project, ProjectCommonFieldsName, SaveHistory +from .projects import Project, ProjectCommonFieldsName diff --git a/app/project_management/models/project_states.py b/app/project_management/models/project_states.py index b82f2f69..19c0326c 100644 --- a/app/project_management/models/project_states.py +++ b/app/project_management/models/project_states.py @@ -1,7 +1,6 @@ from django.db import models from access.fields import AutoCreatedField, AutoLastModifiedField -from access.models.team import Team from access.models.tenancy import TenancyObject from assistance.models.knowledge_base import KnowledgeBase diff --git a/app/project_management/models/project_types.py b/app/project_management/models/project_types.py index 3b39e97e..70c7ab3b 100644 --- a/app/project_management/models/project_types.py +++ b/app/project_management/models/project_types.py @@ -1,7 +1,6 @@ from django.db import models from access.fields import AutoCreatedField, AutoLastModifiedField -from access.models.team import Team from access.models.tenancy import TenancyObject from assistance.models.knowledge_base import KnowledgeBase diff --git a/app/project_management/models/projects.py b/app/project_management/models/projects.py index 29ac27c2..bd4a5d6c 100644 --- a/app/project_management/models/projects.py +++ b/app/project_management/models/projects.py @@ -3,7 +3,6 @@ from django.db import models from access.models.team import Team -from core.mixin.history_save import SaveHistory from core.models.ticket.ticket_enum_values import TicketValues from .project_common import ProjectCommonFieldsName diff --git a/app/project_management/serializers/project.py b/app/project_management/serializers/project.py index 79893cd5..a3f4daf6 100644 --- a/app/project_management/serializers/project.py +++ b/app/project_management/serializers/project.py @@ -1,7 +1,7 @@ from rest_framework import serializers from rest_framework.reverse import reverse -from access.serializers.organization import Organization, TenantBaseSerializer +from access.serializers.organization import TenantBaseSerializer from api.serializers import common from centurion.serializers.user import UserBaseSerializer diff --git a/app/project_management/serializers/project_milestone.py b/app/project_management/serializers/project_milestone.py index b40e13f9..0a82faec 100644 --- a/app/project_management/serializers/project_milestone.py +++ b/app/project_management/serializers/project_milestone.py @@ -1,6 +1,5 @@ from rest_framework import serializers from rest_framework.fields import empty -from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer diff --git a/app/project_management/serializers/project_milestone_notes.py b/app/project_management/serializers/project_milestone_notes.py index 9f728f69..62f530ff 100644 --- a/app/project_management/serializers/project_milestone_notes.py +++ b/app/project_management/serializers/project_milestone_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/project_management/serializers/project_notes.py b/app/project_management/serializers/project_notes.py index 1a0c90e9..056bf64d 100644 --- a/app/project_management/serializers/project_notes.py +++ b/app/project_management/serializers/project_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/project_management/serializers/project_state_notes.py b/app/project_management/serializers/project_state_notes.py index 8bb22d86..5f4f039b 100644 --- a/app/project_management/serializers/project_state_notes.py +++ b/app/project_management/serializers/project_state_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/project_management/serializers/project_states.py b/app/project_management/serializers/project_states.py index c4a19e03..43174d1e 100644 --- a/app/project_management/serializers/project_states.py +++ b/app/project_management/serializers/project_states.py @@ -1,6 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty -from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer diff --git a/app/project_management/serializers/project_task.py b/app/project_management/serializers/project_task.py index f16f411f..968d4643 100644 --- a/app/project_management/serializers/project_task.py +++ b/app/project_management/serializers/project_task.py @@ -1,7 +1,5 @@ from rest_framework import serializers -from centurion.serializers.user import UserBaseSerializer - from core.models.ticket.ticket_category import TicketCategory from core.serializers.ticket_depreciated import ( Ticket, diff --git a/app/project_management/serializers/project_type.py b/app/project_management/serializers/project_type.py index 15a2c030..21267a9b 100644 --- a/app/project_management/serializers/project_type.py +++ b/app/project_management/serializers/project_type.py @@ -1,6 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty -from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer diff --git a/app/project_management/serializers/project_type_notes.py b/app/project_management/serializers/project_type_notes.py index 844ba7b1..146c06d9 100644 --- a/app/project_management/serializers/project_type_notes.py +++ b/app/project_management/serializers/project_type_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/project_management/viewsets/project.py b/app/project_management/viewsets/project.py index 95357c95..ada06f63 100644 --- a/app/project_management/viewsets/project.py +++ b/app/project_management/viewsets/project.py @@ -1,19 +1,17 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse +from access.models.tenant import Tenant from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from project_management.models.project_history import ProjectHistory # pylint: disable=W0611:unused-import -from project_management.serializers.project import ( +from project_management.serializers.project import ( # pylint: disable=W0611:unused-import Project, ProjectImportSerializer, ProjectModelSerializer, ProjectViewSerializer, - Organization, ) -from settings.models.user_settings import UserSettings - @extend_schema_view( @@ -88,7 +86,7 @@ class ViewSet( ModelViewSet ): organization = int(self.request.data['organization']) - organization = Organization.objects.get( pk = organization ) + organization = Tenant.objects.get( pk = organization ) elif self.queryset: diff --git a/app/project_management/viewsets/project_milestone.py b/app/project_management/viewsets/project_milestone.py index 6359c15d..d85d341d 100644 --- a/app/project_management/viewsets/project_milestone.py +++ b/app/project_management/viewsets/project_milestone.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from project_management.models.project_milestone_history import ProjectMilestoneHistory # pylint: disable=W0611:unused-import -from project_management.serializers.project_milestone import ( +from project_management.serializers.project_milestone import ( # pylint: disable=W0611:unused-import ProjectMilestone, ProjectMilestoneModelSerializer, ProjectMilestoneViewSerializer diff --git a/app/project_management/viewsets/project_state.py b/app/project_management/viewsets/project_state.py index 85fb58e0..942053ac 100644 --- a/app/project_management/viewsets/project_state.py +++ b/app/project_management/viewsets/project_state.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from project_management.models.project_state_history import ProjectStateHistory # pylint: disable=W0611:unused-import -from project_management.serializers.project_states import ( +from project_management.serializers.project_states import ( # pylint: disable=W0611:unused-import ProjectState, ProjectStateModelSerializer, ProjectStateViewSerializer diff --git a/app/project_management/viewsets/project_type.py b/app/project_management/viewsets/project_type.py index 95cd8091..7854c642 100644 --- a/app/project_management/viewsets/project_type.py +++ b/app/project_management/viewsets/project_type.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from project_management.models.project_type_history import ProjectTypeHistory # pylint: disable=W0611:unused-import -from project_management.serializers.project_type import ( +from project_management.serializers.project_type import ( # pylint: disable=W0611:unused-import ProjectType, ProjectTypeModelSerializer, ProjectTypeViewSerializer diff --git a/app/settings/management/commands/device_model.py b/app/settings/management/commands/device_model.py index 9d860c3d..40bc0da9 100644 --- a/app/settings/management/commands/device_model.py +++ b/app/settings/management/commands/device_model.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand from django.db.models import Q -from django.utils import timezone from itam.models.device_models import DeviceModel diff --git a/app/settings/management/commands/device_type.py b/app/settings/management/commands/device_type.py index 8eef58b0..63b22c89 100644 --- a/app/settings/management/commands/device_type.py +++ b/app/settings/management/commands/device_type.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand from django.db.models import Q -from django.utils import timezone from itam.models.device import DeviceType diff --git a/app/settings/management/commands/software.py b/app/settings/management/commands/software.py index ac728178..8719893a 100644 --- a/app/settings/management/commands/software.py +++ b/app/settings/management/commands/software.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand from django.db.models import Q -from django.utils import timezone from itam.models.software import Software diff --git a/app/settings/management/commands/software_categories.py b/app/settings/management/commands/software_categories.py index 8f7c65c4..b2477972 100644 --- a/app/settings/management/commands/software_categories.py +++ b/app/settings/management/commands/software_categories.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand from django.db.models import Q -from django.utils import timezone from itam.models.software import SoftwareCategory diff --git a/app/settings/models/__init__.py b/app/settings/models/__init__.py index 2cd0ead0..d526b454 100644 --- a/app/settings/models/__init__.py +++ b/app/settings/models/__init__.py @@ -1,2 +1,2 @@ -from . import external_link -from . import user_settings \ No newline at end of file +from . import external_link # pylint: disable=W0611:unused-import +from . import user_settings # pylint: disable=W0611:unused-import \ No newline at end of file diff --git a/app/settings/models/external_link.py b/app/settings/models/external_link.py index 97981122..7a66c74a 100644 --- a/app/settings/models/external_link.py +++ b/app/settings/models/external_link.py @@ -1,5 +1,3 @@ -from django.template import Template - from access.fields import * from access.models.tenancy import TenancyObject diff --git a/app/settings/serializers/external_links.py b/app/settings/serializers/external_links.py index 356cf16b..31e62fb8 100644 --- a/app/settings/serializers/external_links.py +++ b/app/settings/serializers/external_links.py @@ -1,5 +1,3 @@ -from rest_framework.reverse import reverse - from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer diff --git a/app/settings/serializers/external_links_notes.py b/app/settings/serializers/external_links_notes.py index c825fd78..1203eb50 100644 --- a/app/settings/serializers/external_links_notes.py +++ b/app/settings/serializers/external_links_notes.py @@ -1,8 +1,4 @@ - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/settings/viewsets/app_settings.py b/app/settings/viewsets/app_settings.py index 8353d085..ba24ef4f 100644 --- a/app/settings/viewsets/app_settings.py +++ b/app/settings/viewsets/app_settings.py @@ -4,7 +4,7 @@ from api.viewsets.common import ModelRetrieveUpdateViewSet # This import only exists so that the migrations can be created from settings.models.app_settings_history import AppSettingsHistory # pylint: disable=W0611:unused-import -from settings.serializers.app_settings import ( +from settings.serializers.app_settings import ( # pylint: disable=W0611:unused-import AppSettings, AppSettingsModelSerializer, AppSettingsViewSerializer diff --git a/app/settings/viewsets/external_link.py b/app/settings/viewsets/external_link.py index 9a6bbc59..0c0d161f 100644 --- a/app/settings/viewsets/external_link.py +++ b/app/settings/viewsets/external_link.py @@ -4,7 +4,11 @@ from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created from settings.models.external_link_history import ExternalLinkHistory # pylint: disable=W0611:unused-import -from settings.serializers.external_links import ExternalLink, ExternalLinkModelSerializer, ExternalLinkViewSerializer +from settings.serializers.external_links import ( # pylint: disable=W0611:unused-import + ExternalLink, + ExternalLinkModelSerializer, + ExternalLinkViewSerializer, +) diff --git a/app/settings/viewsets/user_settings.py b/app/settings/viewsets/user_settings.py index f8623cae..f0384b8d 100644 --- a/app/settings/viewsets/user_settings.py +++ b/app/settings/viewsets/user_settings.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelRetrieveUpdateViewSet -from settings.serializers.user_settings import ( +from settings.serializers.user_settings import ( # pylint: disable=W0611:unused-import UserSettings, UserSettingsModelSerializer, UserSettingsViewSerializer