Skip to content

Commit 6c665a8

Browse files
committed
Use isort to sort imports
1 parent 4b22134 commit 6c665a8

11 files changed

+20
-19
lines changed

.pre-commit-config.yaml

+4-9
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,11 @@ repos:
4747
- id: blacken-docs
4848
additional_dependencies:
4949
- black==23.1.0
50-
- repo: https://github.com/asottile/reorder-python-imports
51-
rev: v3.12.0
50+
- repo: https://github.com/pycqa/isort
51+
rev: 5.13.2
5252
hooks:
53-
- id: reorder-python-imports
54-
args:
55-
- --py38-plus
56-
- --application-directories
57-
- .:example:src
58-
- --add-import
59-
- 'from __future__ import annotations'
53+
- id: isort
54+
name: isort (python)
6055
- repo: https://github.com/PyCQA/flake8
6156
rev: 7.0.0
6257
hooks:

pyproject.toml

+7
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ Repository = "https://github.com/adamchainz/django-linear-migrations"
4646
[tool.black]
4747
target-version = ['py38']
4848

49+
[tool.isort]
50+
add_imports = [
51+
"from __future__ import annotations"
52+
]
53+
force_single_line = true
54+
profile = "black"
55+
4956
[tool.pytest.ini_options]
5057
addopts = """\
5158
--strict-config

src/django_linear_migrations/apps.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from django.apps import apps
1414
from django.conf import settings
1515
from django.core.checks import Error
16-
from django.core.checks import register
1716
from django.core.checks import Tags
17+
from django.core.checks import register
1818
from django.core.signals import setting_changed
1919
from django.db.migrations.loader import MigrationLoader
2020
from django.dispatch import receiver

src/django_linear_migrations/compat.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import sys
66
from typing import no_type_check
77

8-
98
if sys.version_info >= (3, 9):
109
ast_unparse = ast.unparse
1110
else:

src/django_linear_migrations/management/commands/create_max_migration_files.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from django.core.management.commands.makemigrations import Command as BaseCommand
99
from django.db.migrations.loader import MigrationLoader
1010

11+
from django_linear_migrations.apps import MigrationDetails
1112
from django_linear_migrations.apps import first_party_app_configs
1213
from django_linear_migrations.apps import get_graph_plan
13-
from django_linear_migrations.apps import MigrationDetails
1414

1515

1616
class Command(BaseCommand):

src/django_linear_migrations/management/commands/makemigrations.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from django.core.management.commands.makemigrations import Command as BaseCommand
55
from django.db.migrations import Migration
66

7-
from django_linear_migrations.apps import first_party_app_configs
87
from django_linear_migrations.apps import MigrationDetails
8+
from django_linear_migrations.apps import first_party_app_configs
99

1010

1111
class Command(BaseCommand):

src/django_linear_migrations/management/commands/rebase_migration.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
from django.apps import apps
1212
from django.core.management import BaseCommand
1313
from django.core.management import CommandError
14-
from django.db import connections
1514
from django.db import DatabaseError
15+
from django.db import connections
1616
from django.db.migrations.recorder import MigrationRecorder
1717

18-
from django_linear_migrations.apps import is_first_party_app_config
1918
from django_linear_migrations.apps import MigrationDetails
19+
from django_linear_migrations.apps import is_first_party_app_config
2020
from django_linear_migrations.compat import ast_unparse
2121

2222

tests/test_checks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from textwrap import dedent
66

77
import pytest
8-
from django.test import override_settings
98
from django.test import TestCase
9+
from django.test import override_settings
1010

1111
from django_linear_migrations.apps import check_max_migration_files
1212
from tests.utils import empty_migration

tests/test_create_max_migration_files.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import pytest
99
from django.core.management import call_command
10-
from django.test import override_settings
1110
from django.test import TestCase
11+
from django.test import override_settings
1212

1313
from tests.utils import empty_migration
1414

tests/test_makemigrations.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import django
1010
import pytest
1111
from django.db import models
12-
from django.test import override_settings
1312
from django.test import TestCase
13+
from django.test import override_settings
1414

1515
from tests.utils import run_command
1616

tests/test_rebase_migration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
from django.core.management import CommandError
1313
from django.db import connection
1414
from django.db.migrations.recorder import MigrationRecorder
15-
from django.test import override_settings
1615
from django.test import SimpleTestCase
1716
from django.test import TestCase
17+
from django.test import override_settings
1818

1919
from django_linear_migrations.management.commands import rebase_migration as module
2020
from tests.utils import empty_migration

0 commit comments

Comments
 (0)