Browse Source

ref: prevent star import from clobbering Rule in sentry.models.__init__ (#53756)

<!-- Describe your PR here. -->
anthony sottile 1 year ago
parent
commit
9e9eb0c11d

+ 0 - 1
pyproject.toml

@@ -1121,7 +1121,6 @@ module = [
     "tests.sentry.notifications.notifications.organization_request.test_integration_request",
     "tests.sentry.notifications.notifications.test_digests",
     "tests.sentry.notifications.test_utils",
-    "tests.sentry.notifications.utils.test_participants",
     "tests.sentry.notifications.utils.test_tasks",
     "tests.sentry.options.test_store",
     "tests.sentry.ownership.test_grammar",

+ 2 - 1
src/sentry/api/endpoints/event_owners.py

@@ -6,7 +6,8 @@ from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.actor import ActorSerializer
-from sentry.models import ActorTuple, ProjectOwnership, Team
+from sentry.models import ActorTuple, Team
+from sentry.models.projectownership import ProjectOwnership
 
 
 @region_silo_endpoint

+ 1 - 1
src/sentry/api/endpoints/project_ownership.py

@@ -8,9 +8,9 @@ from sentry import audit_log, features
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint, ProjectOwnershipPermission
 from sentry.api.serializers import serialize
-from sentry.models import ProjectOwnership
 from sentry.models.groupowner import GroupOwner
 from sentry.models.project import Project
+from sentry.models.projectownership import ProjectOwnership
 from sentry.ownership.grammar import CODEOWNERS, create_schema_from_issue_owners
 from sentry.signals import ownership_rule_created
 from sentry.utils.audit import create_audit_entry

+ 1 - 1
src/sentry/api/serializers/models/projectownership.py

@@ -1,5 +1,5 @@
 from sentry.api.serializers import Serializer, register
-from sentry.models import ProjectOwnership
+from sentry.models.projectownership import ProjectOwnership
 
 
 @register(ProjectOwnership)

+ 2 - 1
src/sentry/digests/utils.py

@@ -10,7 +10,8 @@ from django.db.models import Q
 
 from sentry.digests import Digest, Record
 from sentry.eventstore.models import Event
-from sentry.models import Group, Project, ProjectOwnership, Rule
+from sentry.models import Group, Project, Rule
+from sentry.models.projectownership import ProjectOwnership
 from sentry.models.rulesnooze import RuleSnooze
 from sentry.notifications.types import ActionTargetType, FallthroughChoiceType
 from sentry.notifications.utils.participants import get_send_to

+ 1 - 1
src/sentry/models/__init__.py

@@ -79,7 +79,7 @@ from .project import *  # NOQA
 from .projectbookmark import *  # NOQA
 from .projectcodeowners import *  # NOQA
 from .projectkey import *  # NOQA
-from .projectownership import *  # NOQA
+from .projectownership import ProjectOwnership  # NOQA
 from .projectplatform import *  # NOQA
 from .projectredirect import *  # NOQA
 from .projectteam import ProjectTeam  # noqa

+ 2 - 1
src/sentry/models/project.py

@@ -492,7 +492,8 @@ class Project(Model, PendingDeletionMixin, OptionMixin, SnowflakeIdMixin):
         Returns True if the settings have successfully been copied over
         Returns False otherwise
         """
-        from sentry.models import EnvironmentProject, ProjectOption, ProjectOwnership, Rule
+        from sentry.models import EnvironmentProject, ProjectOption, Rule
+        from sentry.models.projectownership import ProjectOwnership
         from sentry.models.projectteam import ProjectTeam
 
         model_list = [EnvironmentProject, ProjectOwnership, ProjectTeam, Rule]

+ 2 - 1
src/sentry/models/projectcodeowners.py

@@ -133,7 +133,8 @@ class ProjectCodeOwners(DefaultFieldsModel):
 
 
 def process_resource_change(instance, change, **kwargs):
-    from sentry.models import GroupOwner, ProjectOwnership
+    from sentry.models import GroupOwner
+    from sentry.models.projectownership import ProjectOwnership
 
     cache.set(
         ProjectCodeOwners.get_cache_key(instance.project_id),

+ 2 - 1
src/sentry/models/projectownership.py

@@ -354,7 +354,8 @@ class ProjectOwnership(Model):
 
 
 def process_resource_change(instance, change, **kwargs):
-    from sentry.models import GroupOwner, ProjectOwnership
+    from sentry.models import GroupOwner
+    from sentry.models.projectownership import ProjectOwnership
 
     cache.set(
         ProjectOwnership.get_cache_key(instance.project_id),

+ 1 - 1
src/sentry/notifications/utils/participants.py

@@ -26,13 +26,13 @@ from sentry.models import (
     OrganizationMember,
     OrganizationMemberTeam,
     Project,
-    ProjectOwnership,
     Release,
     Rule,
     Team,
     User,
 )
 from sentry.models.commit import Commit
+from sentry.models.projectownership import ProjectOwnership
 from sentry.models.rulesnooze import RuleSnooze
 from sentry.notifications.helpers import (
     get_settings_by_provider,

Some files were not shown because too many files changed in this diff