From 9e2a50ac0fddebb116ec058ecd12bf1fba06b074 Mon Sep 17 00:00:00 2001 From: Evan Purkhiser Date: Thu, 8 Apr 2021 13:35:27 -0700 Subject: [PATCH] ref(py): Sort imports in demo module (8 files) --- src/sentry/demo/data_population.py | 32 ++++++++++++----------------- src/sentry/demo/demo_org_manager.py | 12 +++++------ src/sentry/demo/demo_start.py | 5 ++--- src/sentry/demo/middleware.py | 2 +- src/sentry/demo/models.py | 5 +++-- src/sentry/demo/settings.py | 1 - src/sentry/demo/tasks.py | 11 +++------- src/sentry/demo/urls.py | 3 ++- 8 files changed, 29 insertions(+), 42 deletions(-) diff --git a/src/sentry/demo/data_population.py b/src/sentry/demo/data_population.py index 74a3ae64f1d40e..9443ea27412297 100644 --- a/src/sentry/demo/data_population.py +++ b/src/sentry/demo/data_population.py @@ -1,31 +1,31 @@ import copy -import logging import functools +import logging import os import random -import requests -import pytz -import sentry_sdk import time - from collections import defaultdict from datetime import timedelta -from django.conf import settings -from django.utils import timezone -from hashlib import sha1 from functools import wraps -from uuid import uuid4 +from hashlib import sha1 from typing import List +from uuid import uuid4 + +import pytz +import requests +import sentry_sdk +from django.conf import settings +from django.utils import timezone from sentry.api.utils import get_date_range_from_params -from sentry.discover.models import DiscoverSavedQuery from sentry.discover.endpoints.serializers import DiscoverSavedQuerySerializer -from sentry.incidents.models import AlertRuleThresholdType, AlertRuleTriggerAction +from sentry.discover.models import DiscoverSavedQuery from sentry.incidents.logic import ( create_alert_rule, create_alert_rule_trigger, create_alert_rule_trigger_action, ) +from sentry.incidents.models import AlertRuleThresholdType, AlertRuleTriggerAction from sentry.interfaces.user import User as UserInterface from sentry.mediators import project_rules from sentry.models import ( @@ -36,22 +36,16 @@ Project, ProjectKey, Release, - ReleaseFile, ReleaseCommit, + ReleaseFile, Repository, Team, ) from sentry.utils import json, loremipsum from sentry.utils.dates import to_timestamp -from sentry.utils.samples import ( - random_geo, - random_ip, - create_sample_event_basic, - random_normal, -) +from sentry.utils.samples import create_sample_event_basic, random_geo, random_ip, random_normal from sentry.utils.snuba import SnubaError - commit_message_base_messages = [ "feat: Do something to", "feat: Update code in", diff --git a/src/sentry/demo/demo_org_manager.py b/src/sentry/demo/demo_org_manager.py index eddfcaed10a2b7..eb2525c88964a8 100644 --- a/src/sentry/demo/demo_org_manager.py +++ b/src/sentry/demo/demo_org_manager.py @@ -1,15 +1,14 @@ import logging -import sentry_sdk +from typing import Tuple +import sentry_sdk from django.conf import settings from django.db import transaction from django.db.models import F from django.template.defaultfilters import slugify -from typing import Tuple from sentry import roles from sentry.models import ( - User, Organization, OrganizationMember, OrganizationMemberTeam, @@ -17,15 +16,14 @@ Project, ProjectKey, Team, + User, ) from sentry.tasks.deletion import delete_organization from sentry.utils.email import create_fake_email -from .data_population import ( - handle_react_python_scenario, -) +from .data_population import handle_react_python_scenario +from .models import DemoOrganization, DemoOrgStatus, DemoUser from .utils import generate_random_name -from .models import DemoUser, DemoOrganization, DemoOrgStatus logger = logging.getLogger(__name__) diff --git a/src/sentry/demo/demo_start.py b/src/sentry/demo/demo_start.py index d577f3e1516b6c..95d596f8aced53 100644 --- a/src/sentry/demo/demo_start.py +++ b/src/sentry/demo/demo_start.py @@ -1,15 +1,14 @@ import logging -import sentry_sdk -from django.http import Http404 +import sentry_sdk from django.conf import settings +from django.http import Http404 from sentry.models import OrganizationMember, OrganizationStatus from sentry.utils import auth from sentry.web.decorators import transaction_start from sentry.web.frontend.base import BaseView - logger = logging.getLogger(__name__) ACCEPTED_TRACKING_COOKIE = "accepted_tracking" diff --git a/src/sentry/demo/middleware.py b/src/sentry/demo/middleware.py index cea39c3a04e079..4cdf5199f58100 100644 --- a/src/sentry/demo/middleware.py +++ b/src/sentry/demo/middleware.py @@ -1,6 +1,6 @@ from django.conf import settings from django.core.urlresolvers import reverse -from django.http import JsonResponse, HttpResponseRedirect +from django.http import HttpResponseRedirect, JsonResponse from sentry.models import OrganizationMember from sentry.utils import auth diff --git a/src/sentry/demo/models.py b/src/sentry/demo/models.py index 2deb3009bbd4a4..08281f5dcfb96c 100644 --- a/src/sentry/demo/models.py +++ b/src/sentry/demo/models.py @@ -1,9 +1,10 @@ +from enum import IntEnum + from django.db import models from django.utils import timezone -from enum import IntEnum +from sentry.db.models import BoundedPositiveIntegerField, FlexibleForeignKey from sentry.models import DefaultFieldsModel, Organization, User -from sentry.db.models import FlexibleForeignKey, BoundedPositiveIntegerField class DemoOrgStatus(IntEnum): diff --git a/src/sentry/demo/settings.py b/src/sentry/demo/settings.py index 3f2486ae3cb329..9c6a5152e06811 100644 --- a/src/sentry/demo/settings.py +++ b/src/sentry/demo/settings.py @@ -4,7 +4,6 @@ from sentry.conf.server import * - """ To get this file to load, add the follwing to your sentry.conf.py file: diff --git a/src/sentry/demo/tasks.py b/src/sentry/demo/tasks.py index 003ae4c62f70ab..b7e66c49547f1c 100644 --- a/src/sentry/demo/tasks.py +++ b/src/sentry/demo/tasks.py @@ -1,20 +1,15 @@ import logging - from datetime import timedelta + from django.conf import settings from django.utils import timezone -from sentry.models import ( - User, - Organization, - OrganizationStatus, -) +from sentry.models import Organization, OrganizationStatus, User from sentry.tasks.base import instrumented_task from sentry.tasks.deletion import delete_organization -from .models import DemoOrgStatus, DemoOrganization from .demo_org_manager import create_demo_org - +from .models import DemoOrganization, DemoOrgStatus logger = logging.getLogger(__name__) diff --git a/src/sentry/demo/urls.py b/src/sentry/demo/urls.py index ad6f3d3e2aa942..5bc6d5f718f4ff 100644 --- a/src/sentry/demo/urls.py +++ b/src/sentry/demo/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import url -from sentry.web.frontend.react_page import ReactPageView from sentry.conf.urls import urlpatterns as conf_urlpatterns +from sentry.web.frontend.react_page import ReactPageView + from .demo_start import DemoStartView # add the demo start route at the head of the urls