diff --git a/app/access/forms/organization.py b/app/access/forms/organization.py index 2cb0412e..3fb3575c 100644 --- a/app/access/forms/organization.py +++ b/app/access/forms/organization.py @@ -1,7 +1,7 @@ from django import forms from django.db.models import Q -from app import settings +from django.conf import settings from access.models.tenant import Tenant as Organization diff --git a/app/access/forms/team.py b/app/access/forms/team.py index 1f6fc8b2..b2f97a64 100644 --- a/app/access/forms/team.py +++ b/app/access/forms/team.py @@ -7,7 +7,7 @@ from .team_users import TeamUsersForm, TeamUsers from access.models.team import Team from access.functions import permissions -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/access/forms/team_users.py b/app/access/forms/team_users.py index e81edc0a..70b7676f 100644 --- a/app/access/forms/team_users.py +++ b/app/access/forms/team_users.py @@ -1,6 +1,6 @@ from django.db.models import Q -from app import settings +from django.conf import settings from access.models.team_user import TeamUsers diff --git a/app/access/serializers/organization.py b/app/access/serializers/organization.py index 7645b947..04436813 100644 --- a/app/access/serializers/organization.py +++ b/app/access/serializers/organization.py @@ -4,7 +4,7 @@ from rest_framework import serializers from access.models.tenant import Tenant -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core import fields as centurion_field diff --git a/app/access/serializers/organization_notes.py b/app/access/serializers/organization_notes.py index 1357f87d..6cf79efd 100644 --- a/app/access/serializers/organization_notes.py +++ b/app/access/serializers/organization_notes.py @@ -4,7 +4,7 @@ from access.models.organization_notes import OrganizationNotes from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/access/serializers/role.py b/app/access/serializers/role.py index 597334ad..541bc8b3 100644 --- a/app/access/serializers/role.py +++ b/app/access/serializers/role.py @@ -9,7 +9,7 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from app.serializers.permission import PermissionBaseSerializer +from centurion.serializers.permission import PermissionBaseSerializer diff --git a/app/access/serializers/role_notes.py b/app/access/serializers/role_notes.py index 439cfbe2..f33a36da 100644 --- a/app/access/serializers/role_notes.py +++ b/app/access/serializers/role_notes.py @@ -4,7 +4,7 @@ from access.models.role_notes import RoleNotes from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/access/serializers/team_notes.py b/app/access/serializers/team_notes.py index 44226be1..06035115 100644 --- a/app/access/serializers/team_notes.py +++ b/app/access/serializers/team_notes.py @@ -4,7 +4,7 @@ from access.models.team_notes import TeamNotes from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/access/serializers/team_user.py b/app/access/serializers/team_user.py index d0c3e63a..198748cf 100644 --- a/app/access/serializers/team_user.py +++ b/app/access/serializers/team_user.py @@ -6,7 +6,7 @@ from access.models.team_user import TeamUsers from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer diff --git a/app/access/serializers/teams.py b/app/access/serializers/teams.py index d677a9c3..8a6bda0e 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 app.serializers.permission import Permission, PermissionBaseSerializer +from centurion.serializers.permission import Permission, PermissionBaseSerializer from core import fields as centurion_field diff --git a/app/access/tests/unit/entity/test_unit_entity_model.py b/app/access/tests/unit/entity/test_unit_entity_model.py index fb7290bf..82b0ffc3 100644 --- a/app/access/tests/unit/entity/test_unit_entity_model.py +++ b/app/access/tests/unit/entity/test_unit_entity_model.py @@ -4,7 +4,7 @@ from django.db import models from access.models.entity import Entity -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( PyTestTenancyObjectInheritedCases, ) diff --git a/app/access/tests/unit/organization/test_organizaiton_permission.py b/app/access/tests/unit/organization/test_organizaiton_permission.py index 989fa432..25c78b87 100644 --- a/app/access/tests/unit/organization/test_organizaiton_permission.py +++ b/app/access/tests/unit/organization/test_organizaiton_permission.py @@ -15,7 +15,7 @@ from access.models.team import Team from access.models.team_user import TeamUsers from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionChange, OrganizationManagerModelPermissionView -from app.tests.abstract.model_permissions import ModelPermissionsView, ModelPermissionsChange +from centurion.tests.abstract.model_permissions import ModelPermissionsView, ModelPermissionsChange User = django.contrib.auth.get_user_model() diff --git a/app/access/tests/unit/organization/test_organization_views.py b/app/access/tests/unit/organization/test_organization_views.py index 4b0d06ad..b9ec7d29 100644 --- a/app/access/tests/unit/organization/test_organization_views.py +++ b/app/access/tests/unit/organization/test_organization_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelDisplay, ModelIndex +from centurion.tests.abstract.models import ModelDisplay, ModelIndex diff --git a/app/access/tests/unit/role/test_unit_role_model.py b/app/access/tests/unit/role/test_unit_role_model.py index cc745104..3fa305e2 100644 --- a/app/access/tests/unit/role/test_unit_role_model.py +++ b/app/access/tests/unit/role/test_unit_role_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.role import Role -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/access/tests/unit/team/test_team_permission.py b/app/access/tests/unit/team/test_team_permission.py index f2f84c12..a301cd23 100644 --- a/app/access/tests/unit/team/test_team_permission.py +++ b/app/access/tests/unit/team/test_team_permission.py @@ -14,7 +14,7 @@ from access.models.team import Team from access.models.team_user import TeamUsers from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissions -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions User = django.contrib.auth.get_user_model() diff --git a/app/access/tests/unit/team/test_team_views.py b/app/access/tests/unit/team/test_team_views.py index a694ab2d..d14f59a2 100644 --- a/app/access/tests/unit/team/test_team_views.py +++ b/app/access/tests/unit/team/test_team_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelAdd, ModelDelete, ModelDisplay +from centurion.tests.abstract.models import ModelAdd, ModelDelete, ModelDisplay diff --git a/app/access/tests/unit/team/test_unit_team_model.py b/app/access/tests/unit/team/test_unit_team_model.py index b5bd66d3..4fad626b 100644 --- a/app/access/tests/unit/team/test_unit_team_model.py +++ b/app/access/tests/unit/team/test_unit_team_model.py @@ -4,7 +4,7 @@ from django.test import TestCase from access.models.team import Team -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/access/tests/unit/team_user/test_team_user_permission.py b/app/access/tests/unit/team_user/test_team_user_permission.py index c80af376..a3dd1892 100644 --- a/app/access/tests/unit/team_user/test_team_user_permission.py +++ b/app/access/tests/unit/team_user/test_team_user_permission.py @@ -15,7 +15,7 @@ from access.models.team_user import TeamUsers from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionAdd, OrganizationManagerModelPermissionDelete -from app.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete +from centurion.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete User = django.contrib.auth.get_user_model() diff --git a/app/access/tests/unit/team_user/test_team_user_views.py b/app/access/tests/unit/team_user/test_team_user_views.py index 57464ad7..c3c47487 100644 --- a/app/access/tests/unit/team_user/test_team_user_views.py +++ b/app/access/tests/unit/team_user/test_team_user_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import AddView, DeleteView +from centurion.tests.abstract.models import AddView, DeleteView diff --git a/app/access/tests/unit/team_user/test_unit_team_user_model.py b/app/access/tests/unit/team_user/test_unit_team_user_model.py index 213e0bf7..406e9a88 100644 --- a/app/access/tests/unit/team_user/test_unit_team_user_model.py +++ b/app/access/tests/unit/team_user/test_unit_team_user_model.py @@ -5,7 +5,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.unit.test_unit_models import NonTenancyObjectInheritedCases +from centurion.tests.unit.test_unit_models import NonTenancyObjectInheritedCases User = django.contrib.auth.get_user_model() diff --git a/app/access/tests/unit/tenancy_object/test_unit_tenancy_object_model.py b/app/access/tests/unit/tenancy_object/test_unit_tenancy_object_model.py index ad83a17e..4bf8e3e5 100644 --- a/app/access/tests/unit/tenancy_object/test_unit_tenancy_object_model.py +++ b/app/access/tests/unit/tenancy_object/test_unit_tenancy_object_model.py @@ -617,7 +617,7 @@ class TenancyObjectInheritedCases( """Test Cases for models that inherit from **Note:** dont use these test cases use - `app.tests.unit.test_unit_models.TenancyObjectInheritedCases` instead + `centurion.tests.unit.test_unit_models.TenancyObjectInheritedCases` instead access.models.tenancy.TenancyObject""" diff --git a/app/accounting/tests/unit/asset_base/test_unit_asset_base_model.py b/app/accounting/tests/unit/asset_base/test_unit_asset_base_model.py index b21d6139..86a2df41 100644 --- a/app/accounting/tests/unit/asset_base/test_unit_asset_base_model.py +++ b/app/accounting/tests/unit/asset_base/test_unit_asset_base_model.py @@ -4,7 +4,7 @@ from django.db import models from accounting.models.asset_base import AssetBase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( PyTestTenancyObjectInheritedCases, ) diff --git a/app/api/forms/user_token.py b/app/api/forms/user_token.py index 824ea087..3681e46c 100644 --- a/app/api/forms/user_token.py +++ b/app/api/forms/user_token.py @@ -3,7 +3,7 @@ from django import forms from api.models.tokens import AuthToken -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/api/models/tokens.py b/app/api/models/tokens.py index 2307ad4b..502aabcc 100644 --- a/app/api/models/tokens.py +++ b/app/api/models/tokens.py @@ -35,7 +35,7 @@ class AuthToken(models.Model): def validate_note_no_token(self, note, token, raise_exception = True) -> bool: """ Ensure plaintext token cant be saved to notes field. - called from app.settings.views.user_settings.TokenAdd.form_valid() + called from centurion.settings.views.user_settings.TokenAdd.form_valid() Args: note (Field): _Note field_ diff --git a/app/api/react_ui_metadata.py b/app/api/react_ui_metadata.py index 29093844..4362b1cf 100644 --- a/app/api/react_ui_metadata.py +++ b/app/api/react_ui_metadata.py @@ -15,7 +15,7 @@ from rest_framework_json_api.utils import get_related_resource_type from access.models.tenant import Tenant -from app.serializers.user import User, UserBaseSerializer +from centurion.serializers.user import User, UserBaseSerializer from core import fields as centurion_field from core.fields.badge import BadgeField diff --git a/app/api/tests/functional/auth_token/test_functional_auth_token_serializer.py b/app/api/tests/functional/auth_token/test_functional_auth_token_serializer.py index 1ad1ea62..a5fb0fa3 100644 --- a/app/api/tests/functional/auth_token/test_functional_auth_token_serializer.py +++ b/app/api/tests/functional/auth_token/test_functional_auth_token_serializer.py @@ -8,7 +8,7 @@ from access.models.tenant import Tenant as Organization from api.serializers.auth_token import AuthToken, AuthTokenModelSerializer -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User # from core.serializers.manufacturer import Manufacturer, ManufacturerModelSerializer diff --git a/app/api/tests/unit/test_unit_api_fields.py b/app/api/tests/unit/test_unit_api_fields.py index ce230543..f04f93bb 100644 --- a/app/api/tests/unit/test_unit_api_fields.py +++ b/app/api/tests/unit/test_unit_api_fields.py @@ -11,7 +11,7 @@ from rest_framework.relations import Hyperlink from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.common import DoesNotExist +from centurion.tests.common import DoesNotExist User = django.contrib.auth.get_user_model() diff --git a/app/api/urls_v2.py b/app/api/urls_v2.py index 6c656864..f62da8af 100644 --- a/app/api/urls_v2.py +++ b/app/api/urls_v2.py @@ -10,7 +10,7 @@ from api.viewsets import ( index as v2 ) -from app.viewsets.base import ( +from centurion.viewsets.base import ( index as base_index_v2, content_type as content_type_v2, permisson as permission_v2, diff --git a/app/assistance/forms/knowledge_base.py b/app/assistance/forms/knowledge_base.py index 1969be9f..ef85cd9e 100644 --- a/app/assistance/forms/knowledge_base.py +++ b/app/assistance/forms/knowledge_base.py @@ -3,7 +3,7 @@ from django import forms from django.urls import reverse from django.forms import ValidationError -from app import settings +from django.conf import settings from assistance.models.knowledge_base import KnowledgeBase diff --git a/app/assistance/serializers/knowledge_base.py b/app/assistance/serializers/knowledge_base.py index 97f2bfd8..d1848aa5 100644 --- a/app/assistance/serializers/knowledge_base.py +++ b/app/assistance/serializers/knowledge_base.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.serializers.organization import TenantBaseSerializer from access.serializers.teams import TeamBaseSerializer -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from api.serializers import common diff --git a/app/assistance/serializers/knowledge_base_category.py b/app/assistance/serializers/knowledge_base_category.py index 0e472c4f..747a3e35 100644 --- a/app/assistance/serializers/knowledge_base_category.py +++ b/app/assistance/serializers/knowledge_base_category.py @@ -7,7 +7,7 @@ from rest_framework.exceptions import ParseError, ValidationError from access.serializers.organization import TenantBaseSerializer from access.serializers.teams import TeamBaseSerializer -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from api.serializers import common diff --git a/app/assistance/serializers/knowledge_base_category_notes.py b/app/assistance/serializers/knowledge_base_category_notes.py index 659fa958..ce69a1c1 100644 --- a/app/assistance/serializers/knowledge_base_category_notes.py +++ b/app/assistance/serializers/knowledge_base_category_notes.py @@ -2,7 +2,7 @@ from rest_framework import serializers from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from assistance.models.knowledge_base_category_notes import KnowledgeCategoryBaseNotes diff --git a/app/assistance/serializers/knowledge_base_notes.py b/app/assistance/serializers/knowledge_base_notes.py index bec23b32..9eeb42f8 100644 --- a/app/assistance/serializers/knowledge_base_notes.py +++ b/app/assistance/serializers/knowledge_base_notes.py @@ -4,7 +4,7 @@ from assistance.models.knowledge_base_notes import KnowledgeBaseNotes from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/assistance/serializers/request.py b/app/assistance/serializers/request.py index aa644202..67e69202 100644 --- a/app/assistance/serializers/request.py +++ b/app/assistance/serializers/request.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.models.ticket.ticket_category import TicketCategory from core.serializers.ticket_depreciated import ( diff --git a/app/assistance/tests/functional/knowledge_base/test_knowledge_base_serializer.py b/app/assistance/tests/functional/knowledge_base/test_knowledge_base_serializer.py index b3efb957..9fe3d6b8 100644 --- a/app/assistance/tests/functional/knowledge_base/test_knowledge_base_serializer.py +++ b/app/assistance/tests/functional/knowledge_base/test_knowledge_base_serializer.py @@ -9,7 +9,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization from access.models.team import Team -from app.tests.abstract.mock_view import MockView +from centurion.tests.abstract.mock_view import MockView from assistance.models.knowledge_base import KnowledgeBase from assistance.serializers.knowledge_base import KnowledgeBaseModelSerializer diff --git a/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_serializer.py b/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_serializer.py index e926e36d..31b2663b 100644 --- a/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_serializer.py +++ b/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_serializer.py @@ -9,7 +9,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization from access.models.team import Team -from app.tests.abstract.mock_view import MockView +from centurion.tests.abstract.mock_view import MockView from assistance.serializers.knowledge_base_category import KnowledgeBaseCategory, KnowledgeBaseCategoryModelSerializer diff --git a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py index 0c23d0f1..5c159acf 100644 --- a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py +++ b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from assistance.models.knowledge_base import KnowledgeBase diff --git a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_views.py b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_views.py index 5c6f6b3c..df1de5a0 100644 --- a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_views.py +++ b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/assistance/tests/unit/knowledge_base/test_unit_knowledge_base_model.py b/app/assistance/tests/unit/knowledge_base/test_unit_knowledge_base_model.py index c648349e..894f1d44 100644 --- a/app/assistance/tests/unit/knowledge_base/test_unit_knowledge_base_model.py +++ b/app/assistance/tests/unit/knowledge_base/test_unit_knowledge_base_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py index 6f21dc0e..edaf150b 100644 --- a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py +++ b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from assistance.models.knowledge_base import KnowledgeBaseCategory diff --git a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_views.py b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_views.py index ffe62a21..e31e6f10 100644 --- a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_views.py +++ b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/assistance/tests/unit/knowledge_base_category/test_unit_knowledge_base_category_model.py b/app/assistance/tests/unit/knowledge_base_category/test_unit_knowledge_base_category_model.py index 8eef6700..1efcc3bb 100644 --- a/app/assistance/tests/unit/knowledge_base_category/test_unit_knowledge_base_category_model.py +++ b/app/assistance/tests/unit/knowledge_base_category/test_unit_knowledge_base_category_model.py @@ -1,4 +1,4 @@ -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/assistance/tests/unit/model_knowledge_base_article/test_unit_model_knowledge_base_article_model.py b/app/assistance/tests/unit/model_knowledge_base_article/test_unit_model_knowledge_base_article_model.py index f2af3b79..7f9fca1a 100644 --- a/app/assistance/tests/unit/model_knowledge_base_article/test_unit_model_knowledge_base_article_model.py +++ b/app/assistance/tests/unit/model_knowledge_base_article/test_unit_model_knowledge_base_article_model.py @@ -5,7 +5,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/app/__init__.py b/app/centurion/__init__.py similarity index 100% rename from app/app/__init__.py rename to app/centurion/__init__.py diff --git a/app/app/asgi.py b/app/centurion/asgi.py similarity index 82% rename from app/app/asgi.py rename to app/centurion/asgi.py index 99c528d6..1923a47a 100644 --- a/app/app/asgi.py +++ b/app/centurion/asgi.py @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'centurion.settings') application = get_asgi_application() diff --git a/app/app/celery.py b/app/centurion/celery.py similarity index 96% rename from app/app/celery.py rename to app/centurion/celery.py index 9230e7eb..8f681397 100644 --- a/app/app/celery.py +++ b/app/centurion/celery.py @@ -12,7 +12,7 @@ from prometheus_client import CollectorRegistry, multiprocess, start_http_server logger = logging.getLogger(__name__) -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'centurion.settings') worker = Celery('app') diff --git a/app/app/context_processors/base.py b/app/centurion/context_processors/base.py similarity index 99% rename from app/app/context_processors/base.py rename to app/centurion/context_processors/base.py index e03da901..08a9e660 100644 --- a/app/app/context_processors/base.py +++ b/app/centurion/context_processors/base.py @@ -1,6 +1,6 @@ import re -from app.urls import urlpatterns +from centurion.urls import urlpatterns from django.conf import settings from django.urls import URLPattern, URLResolver diff --git a/app/app/helpers/merge_software.py b/app/centurion/helpers/merge_software.py similarity index 100% rename from app/app/helpers/merge_software.py rename to app/centurion/helpers/merge_software.py diff --git a/app/app/middleware/timezone.py b/app/centurion/middleware/timezone.py similarity index 100% rename from app/app/middleware/timezone.py rename to app/centurion/middleware/timezone.py diff --git a/app/app/serializers/content_type.py b/app/centurion/serializers/content_type.py similarity index 100% rename from app/app/serializers/content_type.py rename to app/centurion/serializers/content_type.py diff --git a/app/app/serializers/permission.py b/app/centurion/serializers/permission.py similarity index 95% rename from app/app/serializers/permission.py rename to app/centurion/serializers/permission.py index 299cab34..4874aef7 100644 --- a/app/app/serializers/permission.py +++ b/app/centurion/serializers/permission.py @@ -3,7 +3,7 @@ from django.contrib.auth.models import Permission from rest_framework import serializers from rest_framework.reverse import reverse -from app.serializers.content_type import ContentTypeBaseSerializer +from centurion.serializers.content_type import ContentTypeBaseSerializer class PermissionBaseSerializer(serializers.ModelSerializer): diff --git a/app/app/serializers/user.py b/app/centurion/serializers/user.py similarity index 100% rename from app/app/serializers/user.py rename to app/centurion/serializers/user.py diff --git a/app/app/settings.py b/app/centurion/settings.py similarity index 99% rename from app/app/settings.py rename to app/centurion/settings.py index cb039519..b5e2b8ac 100644 --- a/app/app/settings.py +++ b/app/centurion/settings.py @@ -253,12 +253,12 @@ MIDDLEWARE = [ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'core.middleware.get_request.RequestMiddleware', - 'app.middleware.timezone.TimezoneMiddleware', + 'centurion.middleware.timezone.TimezoneMiddleware', 'centurion_feature_flag.middleware.feature_flag.FeatureFlagMiddleware', ] -ROOT_URLCONF = 'app.urls' +ROOT_URLCONF = 'centurion.urls' TEMPLATES = [ { @@ -273,13 +273,13 @@ TEMPLATES = [ 'django.contrib.messages.context_processors.messages', 'social_django.context_processors.backends', 'social_django.context_processors.login_redirect', - 'app.context_processors.base.common', + 'centurion.context_processors.base.common', ], }, }, ] -WSGI_APPLICATION = 'app.wsgi.application' +WSGI_APPLICATION = 'centurion.wsgi.application' # Database diff --git a/app/app/tests/__init__.py b/app/centurion/tests/__init__.py similarity index 100% rename from app/app/tests/__init__.py rename to app/centurion/tests/__init__.py diff --git a/app/app/tests/abstract/__init__.py b/app/centurion/tests/abstract/__init__.py similarity index 100% rename from app/app/tests/abstract/__init__.py rename to app/centurion/tests/abstract/__init__.py diff --git a/app/app/tests/abstract/mock_view.py b/app/centurion/tests/abstract/mock_view.py similarity index 100% rename from app/app/tests/abstract/mock_view.py rename to app/centurion/tests/abstract/mock_view.py diff --git a/app/app/tests/abstract/model_permissions.py b/app/centurion/tests/abstract/model_permissions.py similarity index 100% rename from app/app/tests/abstract/model_permissions.py rename to app/centurion/tests/abstract/model_permissions.py diff --git a/app/app/tests/abstract/models.py b/app/centurion/tests/abstract/models.py similarity index 88% rename from app/app/tests/abstract/models.py rename to app/centurion/tests/abstract/models.py index b38d419d..bae0a835 100644 --- a/app/app/tests/abstract/models.py +++ b/app/centurion/tests/abstract/models.py @@ -1,4 +1,4 @@ -from app.tests.abstract.views import AddView, ChangeView, DeleteView, DisplayView, IndexView +from centurion.tests.abstract.views import AddView, ChangeView, DeleteView, DisplayView, IndexView diff --git a/app/app/tests/abstract/views.py b/app/centurion/tests/abstract/views.py similarity index 100% rename from app/app/tests/abstract/views.py rename to app/centurion/tests/abstract/views.py diff --git a/app/app/tests/common.py b/app/centurion/tests/common.py similarity index 100% rename from app/app/tests/common.py rename to app/centurion/tests/common.py diff --git a/app/app/tests/functional/__init__.py b/app/centurion/tests/functional/__init__.py similarity index 100% rename from app/app/tests/functional/__init__.py rename to app/centurion/tests/functional/__init__.py diff --git a/app/app/tests/functional/content_type/test_content_type_permission_viewset.py b/app/centurion/tests/functional/content_type/test_content_type_permission_viewset.py similarity index 100% rename from app/app/tests/functional/content_type/test_content_type_permission_viewset.py rename to app/centurion/tests/functional/content_type/test_content_type_permission_viewset.py diff --git a/app/app/tests/functional/permission/test_permissions_permission_viewset.py b/app/centurion/tests/functional/permission/test_permissions_permission_viewset.py similarity index 100% rename from app/app/tests/functional/permission/test_permissions_permission_viewset.py rename to app/centurion/tests/functional/permission/test_permissions_permission_viewset.py diff --git a/app/app/tests/functional/test_helpers_merge_software.py b/app/centurion/tests/functional/test_helpers_merge_software.py similarity index 97% rename from app/app/tests/functional/test_helpers_merge_software.py rename to app/centurion/tests/functional/test_helpers_merge_software.py index e0053bdf..eaf02029 100644 --- a/app/app/tests/functional/test_helpers_merge_software.py +++ b/app/centurion/tests/functional/test_helpers_merge_software.py @@ -2,7 +2,7 @@ from django.conf import settings as django_settings from django.shortcuts import reverse from django.test import TestCase, Client -from app.helpers.merge_software import merge_software +from centurion.helpers.merge_software import merge_software import pytest diff --git a/app/app/tests/functional/user/test_user_permission_viewset.py b/app/centurion/tests/functional/user/test_user_permission_viewset.py similarity index 100% rename from app/app/tests/functional/user/test_user_permission_viewset.py rename to app/centurion/tests/functional/user/test_user_permission_viewset.py diff --git a/app/app/tests/ui/conftest.py b/app/centurion/tests/ui/conftest.py similarity index 98% rename from app/app/tests/ui/conftest.py rename to app/centurion/tests/ui/conftest.py index 889a9bca..b350f172 100644 --- a/app/app/tests/ui/conftest.py +++ b/app/centurion/tests/ui/conftest.py @@ -1,4 +1,4 @@ -from app.urls import urlpatterns +from centurion.urls import urlpatterns class Data: diff --git a/app/app/tests/ui/test_page_links.py b/app/centurion/tests/ui/test_page_links.py similarity index 98% rename from app/app/tests/ui/test_page_links.py rename to app/centurion/tests/ui/test_page_links.py index bb1d2720..fa293be9 100644 --- a/app/app/tests/ui/test_page_links.py +++ b/app/centurion/tests/ui/test_page_links.py @@ -5,7 +5,7 @@ import unittest from django.test import LiveServerTestCase -from app.urls import urlpatterns +from centurion.urls import urlpatterns from conftest import Data diff --git a/app/app/tests/unit/test_context_processor_base.py b/app/centurion/tests/unit/test_context_processor_base.py similarity index 100% rename from app/app/tests/unit/test_context_processor_base.py rename to app/centurion/tests/unit/test_context_processor_base.py diff --git a/app/app/tests/unit/test_preperation_work.py b/app/centurion/tests/unit/test_preperation_work.py similarity index 100% rename from app/app/tests/unit/test_preperation_work.py rename to app/centurion/tests/unit/test_preperation_work.py diff --git a/app/app/tests/unit/test_settings.py b/app/centurion/tests/unit/test_settings.py similarity index 99% rename from app/app/tests/unit/test_settings.py rename to app/centurion/tests/unit/test_settings.py index 4ecb9694..7d37561f 100644 --- a/app/app/tests/unit/test_settings.py +++ b/app/centurion/tests/unit/test_settings.py @@ -4,7 +4,7 @@ from django.conf import settings as django_settings from django.shortcuts import reverse from django.test import TestCase, Client -from app import settings +from django.conf import settings diff --git a/app/app/tests/unit/test_unit_models.py b/app/centurion/tests/unit/test_unit_models.py similarity index 100% rename from app/app/tests/unit/test_unit_models.py rename to app/centurion/tests/unit/test_unit_models.py diff --git a/app/app/urls.py b/app/centurion/urls.py similarity index 98% rename from app/app/urls.py rename to app/centurion/urls.py index 64e4ce5c..ffa4fd0d 100644 --- a/app/app/urls.py +++ b/app/centurion/urls.py @@ -8,7 +8,7 @@ Function views 1. Add an import: from my_app import views 2. Add a URL to urlpatterns: path('', views.home, name='home') Class-based views - 1. Add an import: from other_app.views import Home + 1. Add an import: from other_centurion.views import Home 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') Including another URLconf 1. Import the include() function: from django.urls import include, path diff --git a/app/app/views/__init__.py b/app/centurion/views/__init__.py similarity index 100% rename from app/app/views/__init__.py rename to app/centurion/views/__init__.py diff --git a/app/app/views/home.py b/app/centurion/views/home.py similarity index 100% rename from app/app/views/home.py rename to app/centurion/views/home.py diff --git a/app/app/viewsets/base/content_type.py b/app/centurion/viewsets/base/content_type.py similarity index 95% rename from app/app/viewsets/base/content_type.py rename to app/centurion/viewsets/base/content_type.py index 976bb5b8..83eb82c5 100644 --- a/app/app/viewsets/base/content_type.py +++ b/app/centurion/viewsets/base/content_type.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import AuthUserReadOnlyModelViewSet -from app.serializers.content_type import ( +from centurion.serializers.content_type import ( ContentType, ContentTypeViewSerializer ) diff --git a/app/app/viewsets/base/index.py b/app/centurion/viewsets/base/index.py similarity index 100% rename from app/app/viewsets/base/index.py rename to app/centurion/viewsets/base/index.py diff --git a/app/app/viewsets/base/permisson.py b/app/centurion/viewsets/base/permisson.py similarity index 95% rename from app/app/viewsets/base/permisson.py rename to app/centurion/viewsets/base/permisson.py index eca74670..387f186b 100644 --- a/app/app/viewsets/base/permisson.py +++ b/app/centurion/viewsets/base/permisson.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import AuthUserReadOnlyModelViewSet -from app.serializers.permission import ( +from centurion.serializers.permission import ( Permission, PermissionViewSerializer ) diff --git a/app/app/viewsets/base/user.py b/app/centurion/viewsets/base/user.py similarity index 96% rename from app/app/viewsets/base/user.py rename to app/centurion/viewsets/base/user.py index ddaf6005..c401a058 100644 --- a/app/app/viewsets/base/user.py +++ b/app/centurion/viewsets/base/user.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import AuthUserReadOnlyModelViewSet -from app.serializers.user import ( +from centurion.serializers.user import ( User, UserBaseSerializer ) diff --git a/app/app/wsgi.py b/app/centurion/wsgi.py similarity index 82% rename from app/app/wsgi.py rename to app/centurion/wsgi.py index 7dd7963f..b4729a04 100644 --- a/app/app/wsgi.py +++ b/app/centurion/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'centurion.settings') application = get_wsgi_application() diff --git a/app/centurion_feature_flag/management/commands/feature_flag.py b/app/centurion_feature_flag/management/commands/feature_flag.py index 622861e7..1bcae005 100644 --- a/app/centurion_feature_flag/management/commands/feature_flag.py +++ b/app/centurion_feature_flag/management/commands/feature_flag.py @@ -2,7 +2,7 @@ import subprocess from django.core.management.base import BaseCommand -from app import settings +from centurion import settings from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging diff --git a/app/centurion_feature_flag/middleware/feature_flag.py b/app/centurion_feature_flag/middleware/feature_flag.py index 8145dfa1..d850fb2d 100644 --- a/app/centurion_feature_flag/middleware/feature_flag.py +++ b/app/centurion_feature_flag/middleware/feature_flag.py @@ -1,4 +1,4 @@ -from app import settings +from centurion import settings from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging diff --git a/app/centurion_feature_flag/urls/django.py b/app/centurion_feature_flag/urls/django.py index 73d8cc5d..f4274a05 100644 --- a/app/centurion_feature_flag/urls/django.py +++ b/app/centurion_feature_flag/urls/django.py @@ -6,7 +6,7 @@ from django.urls.conf import ( RoutePattern as DjangoRoutePattern, ) -from app import settings +from centurion import settings from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging from centurion_feature_flag.views.disabled import FeatureFlagView diff --git a/app/centurion_feature_flag/urls/routers.py b/app/centurion_feature_flag/urls/routers.py index bf3e65ba..ab41c140 100644 --- a/app/centurion_feature_flag/urls/routers.py +++ b/app/centurion_feature_flag/urls/routers.py @@ -5,7 +5,7 @@ from rest_framework.routers import ( SimpleRouter as DRFSimpleRouter, ) -from app import settings +from centurion import settings from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging diff --git a/app/config_management/forms/group/group.py b/app/config_management/forms/group/group.py index 022f083d..521d6578 100644 --- a/app/config_management/forms/group/group.py +++ b/app/config_management/forms/group/group.py @@ -1,7 +1,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from config_management.models.groups import ConfigGroups diff --git a/app/config_management/models/groups.py b/app/config_management/models/groups.py index 652effd8..3e924159 100644 --- a/app/config_management/models/groups.py +++ b/app/config_management/models/groups.py @@ -10,7 +10,7 @@ from rest_framework.reverse import reverse from access.fields import * from access.models.tenancy import TenancyObject -from app.helpers.merge_software import merge_software +from centurion.helpers.merge_software import merge_software from core.lib.feature_not_used import FeatureNotUsed from core.mixin.history_save import SaveHistory diff --git a/app/config_management/serializers/config_group_notes.py b/app/config_management/serializers/config_group_notes.py index 3a8ba73e..bb07209c 100644 --- a/app/config_management/serializers/config_group_notes.py +++ b/app/config_management/serializers/config_group_notes.py @@ -2,7 +2,7 @@ from rest_framework import serializers from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/config_management/tests/functional/config_groups/test_config_groups_serializer.py b/app/config_management/tests/functional/config_groups/test_config_groups_serializer.py index 5c6fa021..ad71203c 100644 --- a/app/config_management/tests/functional/config_groups/test_config_groups_serializer.py +++ b/app/config_management/tests/functional/config_groups/test_config_groups_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from config_management.serializers.config_group import ConfigGroups, ConfigGroupModelSerializer diff --git a/app/config_management/tests/unit/config_groups/test_config_groups_permission.py b/app/config_management/tests/unit/config_groups/test_config_groups_permission.py index e3766c06..f06c287b 100644 --- a/app/config_management/tests/unit/config_groups/test_config_groups_permission.py +++ b/app/config_management/tests/unit/config_groups/test_config_groups_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from config_management.models.groups import ConfigGroups diff --git a/app/config_management/tests/unit/config_groups/test_config_management_views.py b/app/config_management/tests/unit/config_groups/test_config_management_views.py index 9e76fd87..c1f26a79 100644 --- a/app/config_management/tests/unit/config_groups/test_config_management_views.py +++ b/app/config_management/tests/unit/config_groups/test_config_management_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/config_management/tests/unit/config_groups/test_unit_config_groups_model.py b/app/config_management/tests/unit/config_groups/test_unit_config_groups_model.py index e6f4ade7..88ba7eee 100644 --- a/app/config_management/tests/unit/config_groups/test_unit_config_groups_model.py +++ b/app/config_management/tests/unit/config_groups/test_unit_config_groups_model.py @@ -4,7 +4,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py index d25a25a0..36d6912e 100644 --- a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py +++ b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete +from centurion.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete from config_management.models.groups import ConfigGroups, ConfigGroupSoftware diff --git a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_views.py b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_views.py index f3d40699..7b4e5667 100644 --- a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_views.py +++ b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import AddView, ChangeView, DeleteView +from centurion.tests.abstract.models import AddView, ChangeView, DeleteView diff --git a/app/config_management/tests/unit/config_groups_software/test_unit_config_groups_software_model.py b/app/config_management/tests/unit/config_groups_software/test_unit_config_groups_software_model.py index 2509e6ff..5265cd6a 100644 --- a/app/config_management/tests/unit/config_groups_software/test_unit_config_groups_software_model.py +++ b/app/config_management/tests/unit/config_groups_software/test_unit_config_groups_software_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/core/forms/comment.py b/app/core/forms/comment.py index b4083da5..74d65b1f 100644 --- a/app/core/forms/comment.py +++ b/app/core/forms/comment.py @@ -1,4 +1,4 @@ -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.models.notes import Notes diff --git a/app/core/forms/manufacturer.py b/app/core/forms/manufacturer.py index 9a3b4401..707e5324 100644 --- a/app/core/forms/manufacturer.py +++ b/app/core/forms/manufacturer.py @@ -1,7 +1,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.models.manufacturer import Manufacturer diff --git a/app/core/forms/related_ticket.py b/app/core/forms/related_ticket.py index 08289b85..03f41770 100644 --- a/app/core/forms/related_ticket.py +++ b/app/core/forms/related_ticket.py @@ -2,7 +2,7 @@ from django import forms from django.db.models import Q from django.forms import ValidationError -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/core/forms/ticket.py b/app/core/forms/ticket.py index bf8c7165..62fa0be9 100644 --- a/app/core/forms/ticket.py +++ b/app/core/forms/ticket.py @@ -2,7 +2,7 @@ from django import forms from django.db.models import Q from django.forms import ValidationError -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.forms.validate_ticket import TicketValidation diff --git a/app/core/forms/ticket_categories.py b/app/core/forms/ticket_categories.py index 61db679f..e525f788 100644 --- a/app/core/forms/ticket_categories.py +++ b/app/core/forms/ticket_categories.py @@ -2,7 +2,7 @@ from django import forms from django.forms import ValidationError from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.models.ticket.ticket_category import TicketCategory diff --git a/app/core/forms/ticket_comment.py b/app/core/forms/ticket_comment.py index 0a93265e..d95bdf05 100644 --- a/app/core/forms/ticket_comment.py +++ b/app/core/forms/ticket_comment.py @@ -1,7 +1,7 @@ from django import forms from django.db.models import Q -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.forms.validate_ticket_comment import TicketCommentValidation diff --git a/app/core/forms/ticket_comment_category.py b/app/core/forms/ticket_comment_category.py index 9912cff7..783f3809 100644 --- a/app/core/forms/ticket_comment_category.py +++ b/app/core/forms/ticket_comment_category.py @@ -2,7 +2,7 @@ from django import forms from django.forms import ValidationError from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.models.ticket.ticket_comment_category import TicketCommentCategory diff --git a/app/core/forms/ticket_linked_item.py b/app/core/forms/ticket_linked_item.py index 8fbba565..bc0720fd 100644 --- a/app/core/forms/ticket_linked_item.py +++ b/app/core/forms/ticket_linked_item.py @@ -2,7 +2,7 @@ from django import forms from django.db.models import Q from django.forms import ValidationError -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/core/lib/slash_commands/linked_model.py b/app/core/lib/slash_commands/linked_model.py index ccf01e3f..55b26871 100644 --- a/app/core/lib/slash_commands/linked_model.py +++ b/app/core/lib/slash_commands/linked_model.py @@ -45,7 +45,7 @@ For this command to process the following conditions must be met: - `__str__` function within `core.models.ticket.ticket_linked_item.TicketLinkedItem` - - `get_item` function within `app.core.serializar.ticket_linked_item.TicketLinkedItemViewSerializer` + - `get_item` function within `centurion.core.serializar.ticket_linked_item.TicketLinkedItemViewSerializer` Args: match (re.Match): Named group matches diff --git a/app/core/serializers/celery_log.py b/app/core/serializers/celery_log.py index 3b3e3b96..8d74d6b5 100644 --- a/app/core/serializers/celery_log.py +++ b/app/core/serializers/celery_log.py @@ -7,7 +7,7 @@ from django_celery_results.models import TaskResult from access.serializers.organization import TenantBaseSerializer -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core import fields as centurion_field diff --git a/app/core/serializers/history.py b/app/core/serializers/history.py index 14337b07..39088cd8 100644 --- a/app/core/serializers/history.py +++ b/app/core/serializers/history.py @@ -3,7 +3,7 @@ from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.models.model_history import ModelHistory diff --git a/app/core/serializers/manufacturer.py b/app/core/serializers/manufacturer.py index 30a56c2b..ac6ea78f 100644 --- a/app/core/serializers/manufacturer.py +++ b/app/core/serializers/manufacturer.py @@ -3,7 +3,7 @@ from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from api.serializers import common diff --git a/app/core/serializers/model_notes.py b/app/core/serializers/model_notes.py index 6d83a7aa..2b88bb2f 100644 --- a/app/core/serializers/model_notes.py +++ b/app/core/serializers/model_notes.py @@ -6,7 +6,7 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.models.model_notes import ModelNotes diff --git a/app/core/serializers/ticket.py b/app/core/serializers/ticket.py index b516a2cb..b2ff23fc 100644 --- a/app/core/serializers/ticket.py +++ b/app/core/serializers/ticket.py @@ -8,7 +8,7 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core import exceptions as centurion_exception from core import fields as centurion_field diff --git a/app/core/serializers/ticket_comment_category.py b/app/core/serializers/ticket_comment_category.py index 97cfbabb..2d40fef6 100644 --- a/app/core/serializers/ticket_comment_category.py +++ b/app/core/serializers/ticket_comment_category.py @@ -3,7 +3,7 @@ from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from api.serializers import common diff --git a/app/core/serializers/ticket_comment_depreciated.py b/app/core/serializers/ticket_comment_depreciated.py index 4fe2d90d..6b9fcb41 100644 --- a/app/core/serializers/ticket_comment_depreciated.py +++ b/app/core/serializers/ticket_comment_depreciated.py @@ -9,7 +9,7 @@ from access.serializers.teams import TeamBaseSerializer from api.serializers import common from api.exceptions import UnknownTicketType -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core import exceptions as centurion_exceptions from core import fields as centurion_field diff --git a/app/core/serializers/ticket_depreciated.py b/app/core/serializers/ticket_depreciated.py index deebc041..b2d326a8 100644 --- a/app/core/serializers/ticket_depreciated.py +++ b/app/core/serializers/ticket_depreciated.py @@ -4,7 +4,7 @@ from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from access.serializers.teams import TeamBaseSerializer -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from api.serializers import common from api.serializers.common import OrganizationField diff --git a/app/core/tests/abstract/history_permissions.py b/app/core/tests/abstract/history_permissions.py index 8e5fef49..5b2a67ca 100644 --- a/app/core/tests/abstract/history_permissions.py +++ b/app/core/tests/abstract/history_permissions.py @@ -17,7 +17,7 @@ class HistoryPermissions: """Test cases for accessing History For this test to function properly you must add the history items model to - `app.core.views.history.View.get_object()`. specifically an entry to the switch in the middle + `centurion.core.views.history.View.get_object()`. specifically an entry to the switch in the middle of the function. """ diff --git a/app/core/tests/abstract/test_unit_model_notes_serializer.py b/app/core/tests/abstract/test_unit_model_notes_serializer.py index aecb7f7e..d51a02de 100644 --- a/app/core/tests/abstract/test_unit_model_notes_serializer.py +++ b/app/core/tests/abstract/test_unit_model_notes_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView +from centurion.tests.abstract.mock_view import MockView User = django.contrib.auth.get_user_model() 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 2252d05f..36b47d3a 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 @@ -7,7 +7,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView +from centurion.tests.abstract.mock_view import MockView from core.serializers.ticket_related import ( Ticket, diff --git a/app/core/tests/functional/ticket_category/test_ticket_category_serializer.py b/app/core/tests/functional/ticket_category/test_ticket_category_serializer.py index a1ff55ef..3602a6b3 100644 --- a/app/core/tests/functional/ticket_category/test_ticket_category_serializer.py +++ b/app/core/tests/functional/ticket_category/test_ticket_category_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from core.serializers.ticket_category import TicketCategory, TicketCategoryModelSerializer diff --git a/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_serializer.py b/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_serializer.py index fa239694..c1226511 100644 --- a/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_serializer.py +++ b/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from core.serializers.ticket_comment_category import TicketCommentCategory, TicketCommentCategoryModelSerializer diff --git a/app/core/tests/unit/manufacturer/test_manufacturer_permission.py b/app/core/tests/unit/manufacturer/test_manufacturer_permission.py index 7b462336..bab82294 100644 --- a/app/core/tests/unit/manufacturer/test_manufacturer_permission.py +++ b/app/core/tests/unit/manufacturer/test_manufacturer_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from core.models.manufacturer import Manufacturer diff --git a/app/core/tests/unit/manufacturer/test_manufacturer_views.py b/app/core/tests/unit/manufacturer/test_manufacturer_views.py index 5b2b7881..f974e674 100644 --- a/app/core/tests/unit/manufacturer/test_manufacturer_views.py +++ b/app/core/tests/unit/manufacturer/test_manufacturer_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/core/tests/unit/manufacturer/test_unit_manufacturer_model.py b/app/core/tests/unit/manufacturer/test_unit_manufacturer_model.py index 4f52081a..125a71e1 100644 --- a/app/core/tests/unit/manufacturer/test_unit_manufacturer_model.py +++ b/app/core/tests/unit/manufacturer/test_unit_manufacturer_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/core/tests/unit/model_notes/test_unit_model_notes_model.py b/app/core/tests/unit/model_notes/test_unit_model_notes_model.py index aedc2df5..2eab5bf8 100644 --- a/app/core/tests/unit/model_notes/test_unit_model_notes_model.py +++ b/app/core/tests/unit/model_notes/test_unit_model_notes_model.py @@ -5,7 +5,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import TenancyObjectInheritedCases +from centurion.tests.unit.test_unit_models import TenancyObjectInheritedCases from core.models.model_notes import ModelNotes diff --git a/app/core/tests/unit/test_history/test_unit_history_model.py b/app/core/tests/unit/test_history/test_unit_history_model.py index 15c6bcfb..c8c75c13 100644 --- a/app/core/tests/unit/test_history/test_unit_history_model.py +++ b/app/core/tests/unit/test_history/test_unit_history_model.py @@ -5,7 +5,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import TenancyObjectInheritedCases +from centurion.tests.unit.test_unit_models import TenancyObjectInheritedCases from core.models.manufacturer_history import Manufacturer from core.models.model_history import ModelHistory diff --git a/app/core/tests/unit/test_task_result/test_task_result.py b/app/core/tests/unit/test_task_result/test_task_result.py index 3518114c..a1b7f0f6 100644 --- a/app/core/tests/unit/test_task_result/test_task_result.py +++ b/app/core/tests/unit/test_task_result/test_task_result.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissionsView +from centurion.tests.abstract.model_permissions import ModelPermissionsView from django_celery_results.models import TaskResult diff --git a/app/core/tests/unit/test_task_result/test_task_result_views.py b/app/core/tests/unit/test_task_result/test_task_result_views.py index e7d3f037..f579dae2 100644 --- a/app/core/tests/unit/test_task_result/test_task_result_views.py +++ b/app/core/tests/unit/test_task_result/test_task_result_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelDisplay, ModelIndex +from centurion.tests.abstract.models import ModelDisplay, ModelIndex diff --git a/app/core/tests/unit/ticket_base/test_unit_ticket_base_model.py b/app/core/tests/unit/ticket_base/test_unit_ticket_base_model.py index 83b02ed7..9f591bb3 100644 --- a/app/core/tests/unit/ticket_base/test_unit_ticket_base_model.py +++ b/app/core/tests/unit/ticket_base/test_unit_ticket_base_model.py @@ -8,7 +8,7 @@ from django.test import TestCase from access.models.entity import Entity -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( PyTestTenancyObjectInheritedCases, ) diff --git a/app/core/tests/unit/ticket_category/test_ticket_category_permission.py b/app/core/tests/unit/ticket_category/test_ticket_category_permission.py index 8d18a7b8..e1b3c0e7 100644 --- a/app/core/tests/unit/ticket_category/test_ticket_category_permission.py +++ b/app/core/tests/unit/ticket_category/test_ticket_category_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from core.models.ticket.ticket_category import TicketCategory diff --git a/app/core/tests/unit/ticket_category/test_ticket_category_views.py b/app/core/tests/unit/ticket_category/test_ticket_category_views.py index 2c001e84..b4c9d9e4 100644 --- a/app/core/tests/unit/ticket_category/test_ticket_category_views.py +++ b/app/core/tests/unit/ticket_category/test_ticket_category_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel, ModelAdd, ModelChange, ModelDelete +from centurion.tests.abstract.models import PrimaryModel, ModelAdd, ModelChange, ModelDelete diff --git a/app/core/tests/unit/ticket_category/test_unit_ticket_category_model.py b/app/core/tests/unit/ticket_category/test_unit_ticket_category_model.py index f8df0a20..ed0d9eeb 100644 --- a/app/core/tests/unit/ticket_category/test_unit_ticket_category_model.py +++ b/app/core/tests/unit/ticket_category/test_unit_ticket_category_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/core/tests/unit/ticket_comment/test_ticket_comment_common.py b/app/core/tests/unit/ticket_comment/test_ticket_comment_common.py index 3568fa67..156e4a79 100644 --- a/app/core/tests/unit/ticket_comment/test_ticket_comment_common.py +++ b/app/core/tests/unit/ticket_comment/test_ticket_comment_common.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelDisplay, ModelIndex +from centurion.tests.abstract.models import ModelDisplay, ModelIndex from core.models.ticket.ticket_comment import TicketComment diff --git a/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py b/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py index a9bd599f..5698b358 100644 --- a/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py +++ b/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py @@ -15,7 +15,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions, ModelPermissionsAdd, ModelPermissionsChange +from centurion.tests.abstract.model_permissions import ModelPermissions, ModelPermissionsAdd, ModelPermissionsChange from project_management.models.projects import Project diff --git a/app/core/tests/unit/ticket_comment/test_ticket_comment_views.py b/app/core/tests/unit/ticket_comment/test_ticket_comment_views.py index 13a313fe..5b61a66c 100644 --- a/app/core/tests/unit/ticket_comment/test_ticket_comment_views.py +++ b/app/core/tests/unit/ticket_comment/test_ticket_comment_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel, ModelAdd, ModelChange, ModelDelete +from centurion.tests.abstract.models import PrimaryModel, ModelAdd, ModelChange, ModelDelete diff --git a/app/core/tests/unit/ticket_comment/test_unit_ticket_comment_model.py b/app/core/tests/unit/ticket_comment/test_unit_ticket_comment_model.py index 960591e2..bb5ffa32 100644 --- a/app/core/tests/unit/ticket_comment/test_unit_ticket_comment_model.py +++ b/app/core/tests/unit/ticket_comment/test_unit_ticket_comment_model.py @@ -5,7 +5,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py b/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py index 3f9ffab1..913d85e4 100644 --- a/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py +++ b/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py @@ -6,7 +6,7 @@ from django.shortcuts import reverse from rest_framework.relations import Hyperlink -from app.tests.common import DoesNotExist +from centurion.tests.common import DoesNotExist from api.tests.unit.test_unit_api_fields import ( APIFieldsInheritedCases, diff --git a/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_model.py b/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_model.py index 06f0e53c..858b8eda 100644 --- a/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_model.py +++ b/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_model.py @@ -8,7 +8,7 @@ from rest_framework.exceptions import ValidationError from access.models.person import Person -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( PyTestTenancyObjectInheritedCases, ) diff --git a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py index d2a1dee0..d7c5b284 100644 --- a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py +++ b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from core.models.ticket.ticket_comment_category import TicketCommentCategory diff --git a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_views.py b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_views.py index e8ff79d0..39cd19d2 100644 --- a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_views.py +++ b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel, ModelAdd, ModelChange, ModelDelete +from centurion.tests.abstract.models import PrimaryModel, ModelAdd, ModelChange, ModelDelete diff --git a/app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_model.py b/app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_model.py index 106c67fb..4ce7a10a 100644 --- a/app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_model.py +++ b/app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_common.py b/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_common.py index 9c4138e6..b872ce9e 100644 --- a/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_common.py +++ b/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_common.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelDisplay, ModelIndex +from centurion.tests.abstract.models import ModelDisplay, ModelIndex diff --git a/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission.py b/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission.py index 57b81060..7b48e060 100644 --- a/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission.py +++ b/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission.py @@ -17,7 +17,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from project_management.models.projects import Project from project_management.models.project_milestone import ProjectMilestone diff --git a/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_views.py b/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_views.py index 9464ee94..3da527da 100644 --- a/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_views.py +++ b/app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/core/tests/unit/ticket_depreciated/test_unit_ticket_depreciated_model.py b/app/core/tests/unit/ticket_depreciated/test_unit_ticket_depreciated_model.py index e7e1bbf8..7b87fe8c 100644 --- a/app/core/tests/unit/ticket_depreciated/test_unit_ticket_depreciated_model.py +++ b/app/core/tests/unit/ticket_depreciated/test_unit_ticket_depreciated_model.py @@ -2,7 +2,7 @@ import django from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py index b899da73..68465d04 100644 --- a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py +++ b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py @@ -15,7 +15,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions, ModelPermissionsAdd +from centurion.tests.abstract.model_permissions import ModelPermissions, ModelPermissionsAdd from project_management.models.projects import Project diff --git a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_views.py b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_views.py index 782e5f48..920e822f 100644 --- a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_views.py +++ b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelAdd, PrimaryModel +from centurion.tests.abstract.models import ModelAdd, PrimaryModel diff --git a/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py b/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py index bd11e74e..c1a7ae33 100644 --- a/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py +++ b/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py @@ -7,7 +7,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView +from centurion.tests.abstract.mock_view import MockView from devops.serializers.software_enable_feature_flag import SoftwareEnableFeatureFlag, ModelSerializer diff --git a/app/devops/tests/unit/check_ins/test_unit_check_ins_model.py b/app/devops/tests/unit/check_ins/test_unit_check_ins_model.py index 75e54abf..33ed4d6a 100644 --- a/app/devops/tests/unit/check_ins/test_unit_check_ins_model.py +++ b/app/devops/tests/unit/check_ins/test_unit_check_ins_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/devops/tests/unit/feature_flag/test_unit_feature_flag_model.py b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_model.py index 4cd2fdad..f4075184 100644 --- a/app/devops/tests/unit/feature_flag/test_unit_feature_flag_model.py +++ b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_model.py b/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_model.py index a6398506..467a4081 100644 --- a/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_model.py +++ b/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/forms/device/device.py b/app/itam/forms/device/device.py index d6b78ed5..db23d1d7 100644 --- a/app/itam/forms/device/device.py +++ b/app/itam/forms/device/device.py @@ -1,7 +1,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itam/forms/device/operating_system.py b/app/itam/forms/device/operating_system.py index 8af3e2af..1e307ad8 100644 --- a/app/itam/forms/device/operating_system.py +++ b/app/itam/forms/device/operating_system.py @@ -1,7 +1,7 @@ from django import forms from django.db.models import Q -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itam/forms/device_model.py b/app/itam/forms/device_model.py index 1fd76d55..b77555e4 100644 --- a/app/itam/forms/device_model.py +++ b/app/itam/forms/device_model.py @@ -1,7 +1,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itam/forms/device_type.py b/app/itam/forms/device_type.py index a4ac8221..117e3678 100644 --- a/app/itam/forms/device_type.py +++ b/app/itam/forms/device_type.py @@ -1,7 +1,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itam/forms/operating_system/update.py b/app/itam/forms/operating_system/update.py index 80473a24..d3827995 100644 --- a/app/itam/forms/operating_system/update.py +++ b/app/itam/forms/operating_system/update.py @@ -1,7 +1,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itam/forms/software/update.py b/app/itam/forms/software/update.py index 7aa67703..1ed2c4ab 100644 --- a/app/itam/forms/software/update.py +++ b/app/itam/forms/software/update.py @@ -2,7 +2,7 @@ from django import forms from django.db.models import Q from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itam/forms/software_category.py b/app/itam/forms/software_category.py index 755cfbd9..456b46da 100644 --- a/app/itam/forms/software_category.py +++ b/app/itam/forms/software_category.py @@ -1,7 +1,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itam/models/device.py b/app/itam/models/device.py index 077ee4b2..b3a09ac1 100644 --- a/app/itam/models/device.py +++ b/app/itam/models/device.py @@ -14,7 +14,7 @@ from rest_framework.reverse import reverse from access.fields import * from access.models.tenancy import TenancyObject -from app.helpers.merge_software import merge_software +from centurion.helpers.merge_software import merge_software from core.classes.icon import Icon from core.lib.feature_not_used import FeatureNotUsed diff --git a/app/itam/serializers/device_model_notes.py b/app/itam/serializers/device_model_notes.py index 753a37ab..e226bae7 100644 --- a/app/itam/serializers/device_model_notes.py +++ b/app/itam/serializers/device_model_notes.py @@ -1,4 +1,4 @@ -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/itam/serializers/device_notes.py b/app/itam/serializers/device_notes.py index c22ccc87..6d0e9165 100644 --- a/app/itam/serializers/device_notes.py +++ b/app/itam/serializers/device_notes.py @@ -5,7 +5,7 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/itam/serializers/device_type_notes.py b/app/itam/serializers/device_type_notes.py index 2752ebf2..5d2d951a 100644 --- a/app/itam/serializers/device_type_notes.py +++ b/app/itam/serializers/device_type_notes.py @@ -1,4 +1,4 @@ -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/itam/serializers/operating_system_notes.py b/app/itam/serializers/operating_system_notes.py index e288ca4f..c4af2897 100644 --- a/app/itam/serializers/operating_system_notes.py +++ b/app/itam/serializers/operating_system_notes.py @@ -1,5 +1,5 @@ -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/itam/serializers/operating_system_version_notes.py b/app/itam/serializers/operating_system_version_notes.py index 8ecc0a6f..41e547b1 100644 --- a/app/itam/serializers/operating_system_version_notes.py +++ b/app/itam/serializers/operating_system_version_notes.py @@ -1,5 +1,5 @@ -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/itam/tests/functional/device/test_device_serializer.py b/app/itam/tests/functional/device/test_device_serializer.py index f18e96a5..10412a61 100644 --- a/app/itam/tests/functional/device/test_device_serializer.py +++ b/app/itam/tests/functional/device/test_device_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.device import Device, DeviceModelSerializer diff --git a/app/itam/tests/functional/device_model/test_device_model_serializer.py b/app/itam/tests/functional/device_model/test_device_model_serializer.py index 6d4e11ba..3e7f6324 100644 --- a/app/itam/tests/functional/device_model/test_device_model_serializer.py +++ b/app/itam/tests/functional/device_model/test_device_model_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.device_model import DeviceModel, DeviceModelModelSerializer diff --git a/app/itam/tests/functional/device_type/test_device_type_serializer.py b/app/itam/tests/functional/device_type/test_device_type_serializer.py index 85a709bb..e10670ac 100644 --- a/app/itam/tests/functional/device_type/test_device_type_serializer.py +++ b/app/itam/tests/functional/device_type/test_device_type_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.device_type import DeviceType, DeviceTypeModelSerializer diff --git a/app/itam/tests/functional/operating_system/test_operating_system_serializer.py b/app/itam/tests/functional/operating_system/test_operating_system_serializer.py index ddeae281..1784d710 100644 --- a/app/itam/tests/functional/operating_system/test_operating_system_serializer.py +++ b/app/itam/tests/functional/operating_system/test_operating_system_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.operating_system import OperatingSystem, OperatingSystemModelSerializer diff --git a/app/itam/tests/functional/operating_system_version/test_operating_system_version_serializer.py b/app/itam/tests/functional/operating_system_version/test_operating_system_version_serializer.py index 8989a72b..caea6688 100644 --- a/app/itam/tests/functional/operating_system_version/test_operating_system_version_serializer.py +++ b/app/itam/tests/functional/operating_system_version/test_operating_system_version_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.operating_system_version import OperatingSystem, OperatingSystemVersion, OperatingSystemVersionModelSerializer diff --git a/app/itam/tests/functional/software/test_software_serializer.py b/app/itam/tests/functional/software/test_software_serializer.py index 80fe8fa3..144fd698 100644 --- a/app/itam/tests/functional/software/test_software_serializer.py +++ b/app/itam/tests/functional/software/test_software_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.software import Software, SoftwareModelSerializer diff --git a/app/itam/tests/functional/software_category/test_software_category_serializer.py b/app/itam/tests/functional/software_category/test_software_category_serializer.py index d2bff77a..b1142c27 100644 --- a/app/itam/tests/functional/software_category/test_software_category_serializer.py +++ b/app/itam/tests/functional/software_category/test_software_category_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.software_category import SoftwareCategory, SoftwareCategoryModelSerializer diff --git a/app/itam/tests/functional/software_version/test_software_version_serializer.py b/app/itam/tests/functional/software_version/test_software_version_serializer.py index 9d9cb813..d3957d13 100644 --- a/app/itam/tests/functional/software_version/test_software_version_serializer.py +++ b/app/itam/tests/functional/software_version/test_software_version_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.serializers.software_version import Software, SoftwareVersion, SoftwareVersionModelSerializer diff --git a/app/itam/tests/unit/device/test_device_permission.py b/app/itam/tests/unit/device/test_device_permission.py index 8d8f40e0..59032c1f 100644 --- a/app/itam/tests/unit/device/test_device_permission.py +++ b/app/itam/tests/unit/device/test_device_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itam.models.device import Device diff --git a/app/itam/tests/unit/device/test_device_views.py b/app/itam/tests/unit/device/test_device_views.py index 4c58fa2e..5bb2f8b7 100644 --- a/app/itam/tests/unit/device/test_device_views.py +++ b/app/itam/tests/unit/device/test_device_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel class DeviceViews( diff --git a/app/itam/tests/unit/device/test_unit_device_model.py b/app/itam/tests/unit/device/test_unit_device_model.py index d8b8e35f..9ca50c32 100644 --- a/app/itam/tests/unit/device/test_unit_device_model.py +++ b/app/itam/tests/unit/device/test_unit_device_model.py @@ -3,7 +3,7 @@ from django.test import TestCase import pytest -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/device_model/test_device_model_permission.py b/app/itam/tests/unit/device_model/test_device_model_permission.py index a912d2ee..b6896f35 100644 --- a/app/itam/tests/unit/device_model/test_device_model_permission.py +++ b/app/itam/tests/unit/device_model/test_device_model_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itam.models.device import DeviceModel diff --git a/app/itam/tests/unit/device_model/test_device_model_views.py b/app/itam/tests/unit/device_model/test_device_model_views.py index ad38c8a7..27f3364b 100644 --- a/app/itam/tests/unit/device_model/test_device_model_views.py +++ b/app/itam/tests/unit/device_model/test_device_model_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itam/tests/unit/device_model/test_unit_device_model_model.py b/app/itam/tests/unit/device_model/test_unit_device_model_model.py index 1bc2a8db..1303f228 100644 --- a/app/itam/tests/unit/device_model/test_unit_device_model_model.py +++ b/app/itam/tests/unit/device_model/test_unit_device_model_model.py @@ -2,7 +2,7 @@ import pytest from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/device_operating_system/test_device_operating_system_views.py b/app/itam/tests/unit/device_operating_system/test_device_operating_system_views.py index dd2f430b..c4199e6f 100644 --- a/app/itam/tests/unit/device_operating_system/test_device_operating_system_views.py +++ b/app/itam/tests/unit/device_operating_system/test_device_operating_system_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itam/tests/unit/device_operating_system/test_unit_device_operating_system_model.py b/app/itam/tests/unit/device_operating_system/test_unit_device_operating_system_model.py index 19cb9ae8..473accd2 100644 --- a/app/itam/tests/unit/device_operating_system/test_unit_device_operating_system_model.py +++ b/app/itam/tests/unit/device_operating_system/test_unit_device_operating_system_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/device_software/test_device_software_views.py b/app/itam/tests/unit/device_software/test_device_software_views.py index 529b1008..4fc49945 100644 --- a/app/itam/tests/unit/device_software/test_device_software_views.py +++ b/app/itam/tests/unit/device_software/test_device_software_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelAdd, ModelChange, ModelDisplay +from centurion.tests.abstract.models import ModelAdd, ModelChange, ModelDisplay diff --git a/app/itam/tests/unit/device_software/test_unit_device_software_model.py b/app/itam/tests/unit/device_software/test_unit_device_software_model.py index 35f8719c..405d946a 100644 --- a/app/itam/tests/unit/device_software/test_unit_device_software_model.py +++ b/app/itam/tests/unit/device_software/test_unit_device_software_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/device_type/test_device_type_permission.py b/app/itam/tests/unit/device_type/test_device_type_permission.py index c0d74ad0..e96b4693 100644 --- a/app/itam/tests/unit/device_type/test_device_type_permission.py +++ b/app/itam/tests/unit/device_type/test_device_type_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itam.models.device import DeviceType diff --git a/app/itam/tests/unit/device_type/test_device_type_views.py b/app/itam/tests/unit/device_type/test_device_type_views.py index 7b6db09a..be463bc8 100644 --- a/app/itam/tests/unit/device_type/test_device_type_views.py +++ b/app/itam/tests/unit/device_type/test_device_type_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelAdd, ModelChange, ModelDelete, ModelDisplay +from centurion.tests.abstract.models import ModelAdd, ModelChange, ModelDelete, ModelDisplay diff --git a/app/itam/tests/unit/device_type/test_unit_device_type_model.py b/app/itam/tests/unit/device_type/test_unit_device_type_model.py index 9282e6a7..b5994dc9 100644 --- a/app/itam/tests/unit/device_type/test_unit_device_type_model.py +++ b/app/itam/tests/unit/device_type/test_unit_device_type_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/operating_system/test_operating_system_permission.py b/app/itam/tests/unit/operating_system/test_operating_system_permission.py index 94a6d1b7..0cfca2b1 100644 --- a/app/itam/tests/unit/operating_system/test_operating_system_permission.py +++ b/app/itam/tests/unit/operating_system/test_operating_system_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itam.models.operating_system import OperatingSystem diff --git a/app/itam/tests/unit/operating_system/test_operating_system_views.py b/app/itam/tests/unit/operating_system/test_operating_system_views.py index 9aff979d..98d35fc4 100644 --- a/app/itam/tests/unit/operating_system/test_operating_system_views.py +++ b/app/itam/tests/unit/operating_system/test_operating_system_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itam/tests/unit/operating_system/test_unit_operating_system_model.py b/app/itam/tests/unit/operating_system/test_unit_operating_system_model.py index 7e06424f..bc22a383 100644 --- a/app/itam/tests/unit/operating_system/test_unit_operating_system_model.py +++ b/app/itam/tests/unit/operating_system/test_unit_operating_system_model.py @@ -2,7 +2,7 @@ from django.test import TestCase import pytest -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/operating_system_version/test_operating_system_version_views.py b/app/itam/tests/unit/operating_system_version/test_operating_system_version_views.py index e92c0d49..5405a713 100644 --- a/app/itam/tests/unit/operating_system_version/test_operating_system_version_views.py +++ b/app/itam/tests/unit/operating_system_version/test_operating_system_version_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelAdd, ModelChange, ModelDelete, ModelDisplay +from centurion.tests.abstract.models import ModelAdd, ModelChange, ModelDelete, ModelDisplay diff --git a/app/itam/tests/unit/operating_system_version/test_unit_operating_system_version_model.py b/app/itam/tests/unit/operating_system_version/test_unit_operating_system_version_model.py index f86e2d37..fbfceeda 100644 --- a/app/itam/tests/unit/operating_system_version/test_unit_operating_system_version_model.py +++ b/app/itam/tests/unit/operating_system_version/test_unit_operating_system_version_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/software/test_software_permission.py b/app/itam/tests/unit/software/test_software_permission.py index 59138117..1284359b 100644 --- a/app/itam/tests/unit/software/test_software_permission.py +++ b/app/itam/tests/unit/software/test_software_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itam.models.software import Software diff --git a/app/itam/tests/unit/software/test_software_views.py b/app/itam/tests/unit/software/test_software_views.py index 00be4080..8800ede7 100644 --- a/app/itam/tests/unit/software/test_software_views.py +++ b/app/itam/tests/unit/software/test_software_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itam/tests/unit/software/test_unit_software_model.py b/app/itam/tests/unit/software/test_unit_software_model.py index d1a945f5..1765e252 100644 --- a/app/itam/tests/unit/software/test_unit_software_model.py +++ b/app/itam/tests/unit/software/test_unit_software_model.py @@ -2,7 +2,7 @@ import pytest from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/software_category/test_software_category_permission.py b/app/itam/tests/unit/software_category/test_software_category_permission.py index fa2b275f..3b0bd106 100644 --- a/app/itam/tests/unit/software_category/test_software_category_permission.py +++ b/app/itam/tests/unit/software_category/test_software_category_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itam.models.software import SoftwareCategory diff --git a/app/itam/tests/unit/software_category/test_software_category_views.py b/app/itam/tests/unit/software_category/test_software_category_views.py index e493acb5..924ab1a9 100644 --- a/app/itam/tests/unit/software_category/test_software_category_views.py +++ b/app/itam/tests/unit/software_category/test_software_category_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itam/tests/unit/software_category/test_unit_software_category_model.py b/app/itam/tests/unit/software_category/test_unit_software_category_model.py index df020fd3..889990ad 100644 --- a/app/itam/tests/unit/software_category/test_unit_software_category_model.py +++ b/app/itam/tests/unit/software_category/test_unit_software_category_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itam/tests/unit/software_version/test_unit_software_version_model.py b/app/itam/tests/unit/software_version/test_unit_software_version_model.py index 7abe7675..1d3ae8ec 100644 --- a/app/itam/tests/unit/software_version/test_unit_software_version_model.py +++ b/app/itam/tests/unit/software_version/test_unit_software_version_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itim/forms/cluster_type.py b/app/itim/forms/cluster_type.py index 2baa9a8f..1e647eb2 100644 --- a/app/itim/forms/cluster_type.py +++ b/app/itim/forms/cluster_type.py @@ -4,7 +4,7 @@ from django.urls import reverse from itim.models.clusters import ClusterType -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itim/forms/clusters.py b/app/itim/forms/clusters.py index 3f8ae3f4..9412b0cd 100644 --- a/app/itim/forms/clusters.py +++ b/app/itim/forms/clusters.py @@ -4,7 +4,7 @@ from django.urls import reverse from itim.models.clusters import Cluster -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itim/forms/ports.py b/app/itim/forms/ports.py index 8bc6935c..98fc6f7a 100644 --- a/app/itim/forms/ports.py +++ b/app/itim/forms/ports.py @@ -2,7 +2,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from itim.models.services import Port diff --git a/app/itim/forms/services.py b/app/itim/forms/services.py index c88c32bf..69889394 100644 --- a/app/itim/forms/services.py +++ b/app/itim/forms/services.py @@ -4,7 +4,7 @@ from django.urls import reverse from itim.models.services import Service -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/itim/serializers/change.py b/app/itim/serializers/change.py index 28a66fee..49a646a4 100644 --- a/app/itim/serializers/change.py +++ b/app/itim/serializers/change.py @@ -1,7 +1,7 @@ from rest_framework import serializers from rest_framework.fields import empty -from app.serializers.user import UserBaseSerializer +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/incident.py b/app/itim/serializers/incident.py index 22529fbe..9ea5c3db 100644 --- a/app/itim/serializers/incident.py +++ b/app/itim/serializers/incident.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from app.serializers.user import UserBaseSerializer +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/problem.py b/app/itim/serializers/problem.py index c4912b01..a5553d6d 100644 --- a/app/itim/serializers/problem.py +++ b/app/itim/serializers/problem.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from app.serializers.user import UserBaseSerializer +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/tests/functional/cluster/test_cluster_serializer.py b/app/itim/tests/functional/cluster/test_cluster_serializer.py index 1acf40d7..b1d94256 100644 --- a/app/itim/tests/functional/cluster/test_cluster_serializer.py +++ b/app/itim/tests/functional/cluster/test_cluster_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itim.serializers.cluster import Cluster, ClusterModelSerializer diff --git a/app/itim/tests/functional/port/test_port_serializer.py b/app/itim/tests/functional/port/test_port_serializer.py index 48fd5722..5a1177d5 100644 --- a/app/itim/tests/functional/port/test_port_serializer.py +++ b/app/itim/tests/functional/port/test_port_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itim.serializers.port import Port, PortModelSerializer diff --git a/app/itim/tests/functional/service/test_service_serializer.py b/app/itim/tests/functional/service/test_service_serializer.py index 6a0c289b..57644208 100644 --- a/app/itim/tests/functional/service/test_service_serializer.py +++ b/app/itim/tests/functional/service/test_service_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from itam.models.device import Device diff --git a/app/itim/tests/unit/cluster/test_cluster_permission.py b/app/itim/tests/unit/cluster/test_cluster_permission.py index 8bd4d725..63d56902 100644 --- a/app/itim/tests/unit/cluster/test_cluster_permission.py +++ b/app/itim/tests/unit/cluster/test_cluster_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itim.models.clusters import Cluster diff --git a/app/itim/tests/unit/cluster/test_cluster_views.py b/app/itim/tests/unit/cluster/test_cluster_views.py index ba93b740..71d670cf 100644 --- a/app/itim/tests/unit/cluster/test_cluster_views.py +++ b/app/itim/tests/unit/cluster/test_cluster_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itim/tests/unit/cluster/test_unit_cluster_model.py b/app/itim/tests/unit/cluster/test_unit_cluster_model.py index d0878c68..b98d6bb5 100644 --- a/app/itim/tests/unit/cluster/test_unit_cluster_model.py +++ b/app/itim/tests/unit/cluster/test_unit_cluster_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py b/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py index 2790a5ea..70b3d726 100644 --- a/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py +++ b/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itim.models.clusters import ClusterType diff --git a/app/itim/tests/unit/cluster_types/test_cluster_type_views.py b/app/itim/tests/unit/cluster_types/test_cluster_type_views.py index 663190a8..5bf1997c 100644 --- a/app/itim/tests/unit/cluster_types/test_cluster_type_views.py +++ b/app/itim/tests/unit/cluster_types/test_cluster_type_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itim/tests/unit/cluster_types/test_unit_cluster_type_model.py b/app/itim/tests/unit/cluster_types/test_unit_cluster_type_model.py index adfb0b54..01524ed0 100644 --- a/app/itim/tests/unit/cluster_types/test_unit_cluster_type_model.py +++ b/app/itim/tests/unit/cluster_types/test_unit_cluster_type_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itim/tests/unit/port/test_port_permission.py b/app/itim/tests/unit/port/test_port_permission.py index f3f83a54..0c71bd19 100644 --- a/app/itim/tests/unit/port/test_port_permission.py +++ b/app/itim/tests/unit/port/test_port_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itim.models.services import Port diff --git a/app/itim/tests/unit/port/test_port_views.py b/app/itim/tests/unit/port/test_port_views.py index 9776ecc0..7358e962 100644 --- a/app/itim/tests/unit/port/test_port_views.py +++ b/app/itim/tests/unit/port/test_port_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itim/tests/unit/port/test_unit_port_model.py b/app/itim/tests/unit/port/test_unit_port_model.py index c7159a03..7311593c 100644 --- a/app/itim/tests/unit/port/test_unit_port_model.py +++ b/app/itim/tests/unit/port/test_unit_port_model.py @@ -2,7 +2,7 @@ import pytest from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/itim/tests/unit/service/test_service_permission.py b/app/itim/tests/unit/service/test_service_permission.py index e3e499e5..3b29d803 100644 --- a/app/itim/tests/unit/service/test_service_permission.py +++ b/app/itim/tests/unit/service/test_service_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from itim.models.services import Service diff --git a/app/itim/tests/unit/service/test_service_views.py b/app/itim/tests/unit/service/test_service_views.py index 66b2c67d..5e69fbe5 100644 --- a/app/itim/tests/unit/service/test_service_views.py +++ b/app/itim/tests/unit/service/test_service_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/itim/tests/unit/service/test_unit_service_model.py b/app/itim/tests/unit/service/test_unit_service_model.py index 3ea9ce47..aee1fab3 100644 --- a/app/itim/tests/unit/service/test_unit_service_model.py +++ b/app/itim/tests/unit/service/test_unit_service_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/manage.py b/app/manage.py index 49313893..286a8583 100755 --- a/app/manage.py +++ b/app/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'centurion.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/app/project_management/forms/project.py b/app/project_management/forms/project.py index 097e2808..fb9dbed9 100644 --- a/app/project_management/forms/project.py +++ b/app/project_management/forms/project.py @@ -2,7 +2,7 @@ from django import forms from django.urls import reverse from django.db.models import Q -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.templatetags.markdown import to_duration diff --git a/app/project_management/forms/project_milestone.py b/app/project_management/forms/project_milestone.py index 41ee395b..9a29420f 100644 --- a/app/project_management/forms/project_milestone.py +++ b/app/project_management/forms/project_milestone.py @@ -2,7 +2,7 @@ from django import forms from django.urls import reverse from django.db.models import Q -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm from core.templatetags.markdown import to_duration diff --git a/app/project_management/forms/project_states.py b/app/project_management/forms/project_states.py index e317fffa..ea900db5 100644 --- a/app/project_management/forms/project_states.py +++ b/app/project_management/forms/project_states.py @@ -2,7 +2,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/project_management/forms/project_types.py b/app/project_management/forms/project_types.py index 82c1f665..3e3b1776 100644 --- a/app/project_management/forms/project_types.py +++ b/app/project_management/forms/project_types.py @@ -2,7 +2,7 @@ from django import forms from django.urls import reverse -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/project_management/serializers/project.py b/app/project_management/serializers/project.py index b9149392..79893cd5 100644 --- a/app/project_management/serializers/project.py +++ b/app/project_management/serializers/project.py @@ -4,7 +4,7 @@ from rest_framework.reverse import reverse from access.serializers.organization import Organization, TenantBaseSerializer from api.serializers import common -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from access.serializers.teams import TeamBaseSerializer diff --git a/app/project_management/serializers/project_task.py b/app/project_management/serializers/project_task.py index f5cfa3b6..f16f411f 100644 --- a/app/project_management/serializers/project_task.py +++ b/app/project_management/serializers/project_task.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.models.ticket.ticket_category import TicketCategory from core.serializers.ticket_depreciated import ( diff --git a/app/project_management/tests/functional/project_state/test_project_state_serializer.py b/app/project_management/tests/functional/project_state/test_project_state_serializer.py index 9ea8a544..ca115041 100644 --- a/app/project_management/tests/functional/project_state/test_project_state_serializer.py +++ b/app/project_management/tests/functional/project_state/test_project_state_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from project_management.serializers.project_states import ( ProjectState, diff --git a/app/project_management/tests/functional/project_type/test_project_type_serializer.py b/app/project_management/tests/functional/project_type/test_project_type_serializer.py index c442921d..de6f988a 100644 --- a/app/project_management/tests/functional/project_type/test_project_type_serializer.py +++ b/app/project_management/tests/functional/project_type/test_project_type_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from project_management.serializers.project_type import ( ProjectType, diff --git a/app/project_management/tests/unit/project/test_project_permission.py b/app/project_management/tests/unit/project/test_project_permission.py index a1430484..5baa0d7f 100644 --- a/app/project_management/tests/unit/project/test_project_permission.py +++ b/app/project_management/tests/unit/project/test_project_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from project_management.models.projects import Project diff --git a/app/project_management/tests/unit/project/test_project_views.py b/app/project_management/tests/unit/project/test_project_views.py index 743d6a4a..4524087c 100644 --- a/app/project_management/tests/unit/project/test_project_views.py +++ b/app/project_management/tests/unit/project/test_project_views.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/project_management/tests/unit/project/test_unit_project_model.py b/app/project_management/tests/unit/project/test_unit_project_model.py index bd90cb4f..369b55a7 100644 --- a/app/project_management/tests/unit/project/test_unit_project_model.py +++ b/app/project_management/tests/unit/project/test_unit_project_model.py @@ -2,7 +2,7 @@ import pytest from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py index bdf64fce..a8e16dcc 100644 --- a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py +++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from project_management.models.project_milestone import Project, ProjectMilestone diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_views.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_views.py index 5bfcbc69..a62aa7b6 100644 --- a/app/project_management/tests/unit/project_milestone/test_project_milestone_views.py +++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelCommon +from centurion.tests.abstract.models import ModelCommon diff --git a/app/project_management/tests/unit/project_milestone/test_unit_projectmilestone_model.py b/app/project_management/tests/unit/project_milestone/test_unit_projectmilestone_model.py index c96d3d3e..c540895c 100644 --- a/app/project_management/tests/unit/project_milestone/test_unit_projectmilestone_model.py +++ b/app/project_management/tests/unit/project_milestone/test_unit_projectmilestone_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from access.models.tenant import Tenant as Organization -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/project_management/tests/unit/project_state/test_project_state_permission.py b/app/project_management/tests/unit/project_state/test_project_state_permission.py index c30e7a86..b2791311 100644 --- a/app/project_management/tests/unit/project_state/test_project_state_permission.py +++ b/app/project_management/tests/unit/project_state/test_project_state_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from project_management.models.project_states import ProjectState diff --git a/app/project_management/tests/unit/project_state/test_project_state_views.py b/app/project_management/tests/unit/project_state/test_project_state_views.py index 2ff5e69c..ee57cc78 100644 --- a/app/project_management/tests/unit/project_state/test_project_state_views.py +++ b/app/project_management/tests/unit/project_state/test_project_state_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/project_management/tests/unit/project_state/test_unit_project_state_model.py b/app/project_management/tests/unit/project_state/test_unit_project_state_model.py index 375ad822..67ed6c6d 100644 --- a/app/project_management/tests/unit/project_state/test_unit_project_state_model.py +++ b/app/project_management/tests/unit/project_state/test_unit_project_state_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/project_management/tests/unit/project_type/test_project_type_permission.py b/app/project_management/tests/unit/project_type/test_project_type_permission.py index 1308760d..9cf9c882 100644 --- a/app/project_management/tests/unit/project_type/test_project_type_permission.py +++ b/app/project_management/tests/unit/project_type/test_project_type_permission.py @@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from project_management.models.project_types import ProjectType diff --git a/app/project_management/tests/unit/project_type/test_project_type_views.py b/app/project_management/tests/unit/project_type/test_project_type_views.py index 754b0bb4..c0a15ab8 100644 --- a/app/project_management/tests/unit/project_type/test_project_type_views.py +++ b/app/project_management/tests/unit/project_type/test_project_type_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel diff --git a/app/project_management/tests/unit/project_type/test_unit_project_type_model.py b/app/project_management/tests/unit/project_type/test_unit_project_type_model.py index 0255e0ab..b93bbd5e 100644 --- a/app/project_management/tests/unit/project_type/test_unit_project_type_model.py +++ b/app/project_management/tests/unit/project_type/test_unit_project_type_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/settings/forms/external_links.py b/app/settings/forms/external_links.py index 945f0382..d00f1ef3 100644 --- a/app/settings/forms/external_links.py +++ b/app/settings/forms/external_links.py @@ -5,7 +5,7 @@ from django.urls import reverse from access.models.tenant import Tenant as Organization from access.models.team_user import TeamUsers -from app import settings +from django.conf import settings from core.forms.common import CommonModelForm diff --git a/app/settings/serializers/external_links_notes.py b/app/settings/serializers/external_links_notes.py index d46fe7dc..c825fd78 100644 --- a/app/settings/serializers/external_links_notes.py +++ b/app/settings/serializers/external_links_notes.py @@ -1,5 +1,5 @@ -from app.serializers.user import UserBaseSerializer +from centurion.serializers.user import UserBaseSerializer from core.serializers.model_notes import ( ModelNotes, diff --git a/app/settings/tests/functional/external_links/test_external_links_serializer.py b/app/settings/tests/functional/external_links/test_external_links_serializer.py index 26c8cf81..b47f90c3 100644 --- a/app/settings/tests/functional/external_links/test_external_links_serializer.py +++ b/app/settings/tests/functional/external_links/test_external_links_serializer.py @@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError from access.models.tenant import Tenant as Organization -from app.tests.abstract.mock_view import MockView, User +from centurion.tests.abstract.mock_view import MockView, User from settings.serializers.external_links import ( ExternalLink, diff --git a/app/settings/tests/unit/app_settings/test_app_settings_permission.py b/app/settings/tests/unit/app_settings/test_app_settings_permission.py index 8e1f4895..3e2fd522 100644 --- a/app/settings/tests/unit/app_settings/test_app_settings_permission.py +++ b/app/settings/tests/unit/app_settings/test_app_settings_permission.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissionsView +from centurion.tests.abstract.model_permissions import ModelPermissionsView from settings.models.app_settings import AppSettings diff --git a/app/settings/tests/unit/app_settings/test_app_settings_views.py b/app/settings/tests/unit/app_settings/test_app_settings_views.py index 8bca8213..4c0064ba 100644 --- a/app/settings/tests/unit/app_settings/test_app_settings_views.py +++ b/app/settings/tests/unit/app_settings/test_app_settings_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelChange, ModelDisplay +from centurion.tests.abstract.models import ModelChange, ModelDisplay diff --git a/app/settings/tests/unit/external_links/test_external_links_permission.py b/app/settings/tests/unit/external_links/test_external_links_permission.py index f609376d..5008773e 100644 --- a/app/settings/tests/unit/external_links/test_external_links_permission.py +++ b/app/settings/tests/unit/external_links/test_external_links_permission.py @@ -12,7 +12,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissions +from centurion.tests.abstract.model_permissions import ModelPermissions from settings.models.external_link import ExternalLink diff --git a/app/settings/tests/unit/external_links/test_external_links_views.py b/app/settings/tests/unit/external_links/test_external_links_views.py index 81142513..1c46ca33 100644 --- a/app/settings/tests/unit/external_links/test_external_links_views.py +++ b/app/settings/tests/unit/external_links/test_external_links_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import PrimaryModel +from centurion.tests.abstract.models import PrimaryModel class ExternalLinkViews( diff --git a/app/settings/tests/unit/external_links/test_unit_external_links_model.py b/app/settings/tests/unit/external_links/test_unit_external_links_model.py index 50c9e855..2fcc9d03 100644 --- a/app/settings/tests/unit/external_links/test_unit_external_links_model.py +++ b/app/settings/tests/unit/external_links/test_unit_external_links_model.py @@ -1,6 +1,6 @@ from django.test import TestCase -from app.tests.unit.test_unit_models import ( +from centurion.tests.unit.test_unit_models import ( TenancyObjectInheritedCases ) diff --git a/app/settings/tests/unit/user_settings/test_user_settings_permissions.py b/app/settings/tests/unit/user_settings/test_user_settings_permissions.py index 800b2be5..eec6aa33 100644 --- a/app/settings/tests/unit/user_settings/test_user_settings_permissions.py +++ b/app/settings/tests/unit/user_settings/test_user_settings_permissions.py @@ -13,7 +13,7 @@ from access.models.tenant import Tenant as Organization from access.models.team import Team from access.models.team_user import TeamUsers -from app.tests.abstract.model_permissions import ModelPermissionsView +from centurion.tests.abstract.model_permissions import ModelPermissionsView from settings.models.user_settings import UserSettings diff --git a/app/settings/tests/unit/user_settings/test_user_settings_views.py b/app/settings/tests/unit/user_settings/test_user_settings_views.py index 6cafe79d..e4fee492 100644 --- a/app/settings/tests/unit/user_settings/test_user_settings_views.py +++ b/app/settings/tests/unit/user_settings/test_user_settings_views.py @@ -4,7 +4,7 @@ import requests from django.test import TestCase -from app.tests.abstract.models import ModelChange, ModelDisplay +from centurion.tests.abstract.models import ModelChange, ModelDisplay diff --git a/includes/etc/gunicorn.conf.py b/includes/etc/gunicorn.conf.py index 51b4bbad..cfa92ba9 100644 --- a/includes/etc/gunicorn.conf.py +++ b/includes/etc/gunicorn.conf.py @@ -9,7 +9,7 @@ from prometheus_client import CollectorRegistry, multiprocess, start_http_server -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'centurion.settings') access_logfile = '-' access_log_format = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s" "%({x-forwarded-for}i)s"' diff --git a/includes/etc/supervisor/conf.source/gunicorn.conf b/includes/etc/supervisor/conf.source/gunicorn.conf index b1f4b98f..73bc4ab0 100644 --- a/includes/etc/supervisor/conf.source/gunicorn.conf +++ b/includes/etc/supervisor/conf.source/gunicorn.conf @@ -7,4 +7,4 @@ autorestart=true stdout_logfile=/var/log/%(program_name)s.log stderr_logfile=/var/log/%(program_name)s.log directory=/app -command=gunicorn --config=/etc/gunicorn.conf.py app.wsgi:application +command=gunicorn --config=/etc/gunicorn.conf.py centurion.wsgi:application diff --git a/includes/etc/supervisor/conf.source/worker.conf b/includes/etc/supervisor/conf.source/worker.conf index 936d15e5..651e4b04 100644 --- a/includes/etc/supervisor/conf.source/worker.conf +++ b/includes/etc/supervisor/conf.source/worker.conf @@ -7,4 +7,4 @@ autorestart=true stdout_logfile=/var/log/%(program_name)s.log stderr_logfile=/var/log/%(program_name)s.log directory=/app -command=celery -A app worker -l INFO +command=celery -A centurion worker -l INFO diff --git a/pyproject.toml b/pyproject.toml index 4fdcf4d7..e4eddf1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ init-import = true addopts = '--cov --cov-branch --cov-report term --tb=long --verbosity=2 --full-trace --showlocals app' -DJANGO_SETTINGS_MODULE = 'app.settings' +DJANGO_SETTINGS_MODULE = 'centurion.settings' junit_family = 'xunit2' # -- recommended but optional: