[pull] main from django:main

tests/migrations/test_commands.py

@@ -38,9 +38,9 @@
 from django.utils import timezone
 from django.utils.version import get_docs_version
 
+from .base import MigrationTestBase
 from .models import UnicodeModel, UnserializableModel
 from .routers import TestRouter
-from .test_base import MigrationTestBase
 
 HAS_BLACK = shutil.which("black")
 

tests/migrations/test_deprecated_fields.py

@@ -1,7 +1,7 @@
 from django.core.management import call_command
 from django.test import override_settings
 
-from .test_base import MigrationTestBase
+from .base import MigrationTestBase
 
 
 class Tests(MigrationTestBase):

tests/migrations/test_executor.py

@@ -16,7 +16,7 @@
 )
 from django.test.utils import isolate_lru_cache
 
-from .test_base import MigrationTestBase
+from .base import MigrationTestBase
 
 
 @modify_settings(INSTALLED_APPS={"append": "migrations2"})

tests/migrations/test_loader.py

@@ -17,7 +17,7 @@
 from django.db.migrations.recorder import MigrationRecorder
 from django.test import TestCase, modify_settings, override_settings
 
-from .test_base import MigrationTestBase
+from .base import MigrationTestBase
 
 
 class RecorderTests(TestCase):

tests/migrations/test_multidb.py

@@ -2,7 +2,7 @@
 from django.db.migrations.state import ProjectState
 from django.test import override_settings
 
-from .test_base import OperationTestBase
+from .base import OperationTestBase
 
 
 class AgnosticRouter:

tests/migrations/test_operations.py

@@ -19,8 +19,8 @@
 )
 from django.test.utils import CaptureQueriesContext
 
+from .base import OperationTestBase
 from .models import FoodManager, FoodQuerySet, UnicodeModel
-from .test_base import OperationTestBase
 
 
 class Mixin:

tests/migrations/test_optimizer.py

@@ -3,8 +3,8 @@
 from django.db.migrations.optimizer import MigrationOptimizer
 from django.db.models.functions import Abs
 
+from .base import OptimizerTestBase
 from .models import EmptyManager, UnicodeModel
-from .test_base import OptimizerTestBase
 
 
 class OptimizerTests(OptimizerTestBase):

tests/postgres_tests/test_operations.py

@@ -1,6 +1,6 @@
 import unittest
 
-from migrations.test_base import OperationTestBase, OptimizerTestBase
+from migrations.base import OperationTestBase, OptimizerTestBase
 
 from django.db import IntegrityError, NotSupportedError, connection, transaction
 from django.db.migrations.operations import RemoveIndex, RenameIndex