python: Sort imports in database migrations.

This commit is contained in:
Tim Abbott
2017-11-15 15:44:00 -08:00
parent f04d6ed19e
commit 38e97089fc
85 changed files with 78 additions and 145 deletions

View File

@@ -2,16 +2,17 @@
# Generated by Django 1.11.2 on 2017-06-22 10:22
import bitfield.models
from django.conf import settings
import django.contrib.auth.models
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
import zerver.models
from django.conf import settings
from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
import zerver.models
def migrate_existing_attachment_data(apps: StateApps,
schema_editor: DatabaseSchemaEditor) -> None:
Attachment = apps.get_model('zerver', 'Attachment')

View File

@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
from django.db import models, migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
def set_subdomain_of_default_realm(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
if settings.DEVELOPMENT:

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,16 +1,17 @@
# -*- coding: utf-8 -*-
import hashlib
from typing import Text
from django.conf import settings
from django.db import migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from mock import patch
from zerver.lib.utils import make_safe_digest
from zerver.lib.upload import upload_backend
from zerver.lib.utils import make_safe_digest
from zerver.models import UserProfile
from typing import Text
import hashlib
# We hackishly patch this function in order to revert it to the state
# it had when this migration was first written. This is a balance

View File

@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
from django.db.utils import IntegrityError
from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.db import migrations, models
from django.db.utils import IntegrityError
def set_string_id_using_domain(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
Realm = apps.get_model('zerver', 'Realm')

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
from django.db import migrations, models
import bitfield.models
from django.db import migrations, models
class Migration(migrations.Migration):

View File

@@ -3,13 +3,11 @@
import os
from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from zerver.lib.upload import attachment_url_re, attachment_url_to_path_id
def check_and_create_attachments(apps: StateApps,
schema_editor: DatabaseSchemaEditor) -> None:
STREAM = 2

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
from django.db import models, migrations
import django.core.validators
import zerver.models
from django.db import migrations, models
import zerver.models
class Migration(migrations.Migration):

View File

@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
from django.db import migrations, models
import django.db.models.deletion
from django.conf import settings
import zerver.lib.str_utils
from django.db import migrations, models
import zerver.lib.str_utils
class Migration(migrations.Migration):

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-20 07:02
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,7 +2,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-02-11 03:07
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):

View File

@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-02-23 05:37
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,13 +1,11 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-03-04 07:33
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.utils.timezone import now as timezone_now
def backfill_user_activations_and_deactivations(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,19 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-02-27 17:03
import os
from typing import Text
import requests
from boto.s3.bucket import Bucket
from boto.s3.connection import S3Connection
from boto.s3.key import Key
from django.conf import settings
from django.core.files.uploadedfile import SimpleUploadedFile
from django.db import migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.core.files.uploadedfile import SimpleUploadedFile
from django.conf import settings
from zerver.lib.avatar_hash import user_avatar_hash, user_avatar_path
from boto.s3.bucket import Bucket
from boto.s3.key import Key
from boto.s3.connection import S3Connection
from typing import Text
import requests
import os
from zerver.lib.avatar_hash import user_avatar_hash, user_avatar_path
def mkdirs(path: Text) -> None:
dirname = os.path.dirname(path)

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,15 +1,16 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-03-18 12:38
import os
from typing import Text
from boto.s3.bucket import Bucket
from boto.s3.connection import S3Connection
from boto.s3.key import Key
from django.conf import settings
from django.db import migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.conf import settings
from boto.s3.bucket import Bucket
from boto.s3.key import Key
from boto.s3.connection import S3Connection
from typing import Text
import os
class MissingUploadFileException(Exception):
pass

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,12 +2,12 @@
# Generated by Django 1.10.5 on 2017-03-26 01:10
import bitfield.models
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
import zerver.lib.str_utils
from django.conf import settings
from django.db import migrations, models
import zerver.lib.str_utils
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-03-28 00:22
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-04-17 06:49
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,27 +1,22 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-03-09 05:23
import os
import io
import logging
import requests
import os
import urllib
from mimetypes import guess_type
from typing import Dict, Optional, Text, Tuple, Union
from PIL import Image
from PIL import ImageOps
import requests
from boto.s3.connection import S3Connection
from boto.s3.key import Key
from django.conf import settings
from django.db import migrations, models
from django.db import migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.conf import settings
from boto.s3.key import Key
from boto.s3.connection import S3Connection
from PIL import Image, ImageOps
from requests import ConnectionError, Response
from typing import Dict, Text, Tuple, Optional, Union
def force_str(s: Union[Text, bytes], encoding: Text='utf-8') -> str:
"""converts a string to a native string"""

View File

@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-04-27 16:55
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from django.db import migrations
from zerver.lib.migrate import create_index_if_not_exist # nolint
from zerver.lib.migrate import create_index_if_not_exist # nolint
class Migration(migrations.Migration):

View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from django.db import migrations
from zerver.lib.migrate import create_index_if_not_exist # nolint
from zerver.lib.migrate import create_index_if_not_exist # nolint
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-07-11 23:41
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -1,14 +1,13 @@
# -*- coding: utf-8 -*-
from typing import List
from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.db.models import Max
from django.db import migrations, models
from django.utils.timezone import now as timezone_now
from typing import List
def backfill_subscription_log_events(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
migration_time = timezone_now()
RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')

View File

@@ -3,8 +3,8 @@
import django.core.validators
from django.db import migrations, models
import zerver.models
import zerver.models
class Migration(migrations.Migration):

View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from django.db import migrations
from zerver.lib.migrate import create_index_if_not_exist # nolint
from zerver.lib.migrate import create_index_if_not_exist # nolint
class Migration(migrations.Migration):

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,8 +2,8 @@
# Generated by Django 1.11.2 on 2017-06-18 21:26
import os
import ujson
import ujson
from django.conf import settings
from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor

View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from django.db import migrations
from zerver.lib.migrate import create_index_if_not_exist # nolint
from zerver.lib.migrate import create_index_if_not_exist # nolint
class Migration(migrations.Migration):

View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from django.db import migrations
from zerver.lib.migrate import create_index_if_not_exist # nolint
from zerver.lib.migrate import create_index_if_not_exist # nolint
class Migration(migrations.Migration):

View File

@@ -4,7 +4,6 @@
import bitfield.models
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.4 on 2017-08-30 00:26
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import zerver.lib.str_utils
import zerver.lib.str_utils
class Migration(migrations.Migration):

View File

@@ -2,9 +2,9 @@
# Generated by Django 1.11.4 on 2017-08-30 00:26
import ujson
from django.db import connection, migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.db import connection, migrations
def convert_muted_topics(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
stream_query = '''

View File

@@ -3,7 +3,6 @@
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,9 +2,9 @@
# Generated by Django 1.11.4 on 2017-08-30 00:26
import ujson
from django.db import migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.db import migrations
from zerver.lib.fix_unreads import fix

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -3,7 +3,6 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.4 on 2017-09-04 22:48
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from django.db import models, migrations
from django.db import migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps

View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.5 on 2017-10-08 18:37
from django.db import connection, migrations, models
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps
from django.db import connection, migrations, models
def populate_is_zephyr(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
Realm = apps.get_model("zerver", "Realm")

View File

@@ -2,10 +2,9 @@
# Generated by Django 1.11.5 on 2017-10-18 16:15
from __future__ import unicode_literals
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -2,7 +2,6 @@
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,9 +2,8 @@
# Generated by Django 1.11.5 on 2017-10-14 15:12
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):

View File

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -2,10 +2,9 @@
# Generated by Django 1.11.6 on 2017-10-30 05:05
from __future__ import unicode_literals
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):

View File

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [

View File

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [