Fix migrations import

Author: davegaeddert

plain-cache/plain/cache/migrations/0001_initial.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20231127233940 on 2023-12-22 03:47
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-flags/plain/flags/migrations/0001_initial.py

@@ -4,7 +4,8 @@
 
 import plain.flags.models
 import plain.models.deletion
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-models/plain/models/migrations/writer.py

@@ -162,13 +162,7 @@ def as_string(self):
                 imports.remove(line)
                 self.needs_manual_porting = True
 
-        # plain.models.migrations is always used, but models import may not be.
-        # If models import exists, merge it with migrations import.
-        if "from plain import models" in imports:
-            imports.discard("from plain import models")
-            imports.add("from plain.models import migrations, models")
-        else:
-            imports.add("from plain.models import migrations")
+        imports.add("from plain.models import migrations")
 
         # Sort imports by the package / module to be imported (the part after
         # "from" in "from ... import ..." or after "import" in "import ...").

plain-oauth/plain/oauth/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # Generated by Plain 4.0.3 on 2022-03-16 19:11
 
 import plain.models.deletion
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 from plain.runtime import settings
 
 

plain-oauth/plain/oauth/migrations/0002_alter_oauthconnection_options_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 4.0.3 on 2022-03-18 18:24
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-oauth/plain/oauth/migrations/0003_alter_oauthconnection_access_token_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 4.0.6 on 2022-08-11 19:18
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-oauth/plain/oauth/migrations/0004_alter_oauthconnection_access_token_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20230806030948 on 2023-08-08 19:32
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-oauth/tests/users/migrations/0001_initial.py

@@ -3,7 +3,8 @@
 import plain.auth.models
 import plain.auth.validators
 import plain.utils.timezone
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-sessions/plain/sessions/migrations/0001_initial.py

@@ -1,5 +1,6 @@
 import plain.sessions.models
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-sessions/plain/sessions/migrations/0002_alter_session_options_alter_session_expire_date_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20230814020017 on 2023-08-14 02:09
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-staff/plain/staff/admin/migrations/0001_initial.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20230914205221 on 2023-09-15 17:17
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-staff/plain/staff/admin/migrations/0002_alter_dashboard_cards.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20230914205221 on 2023-09-15 17:51
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0001_initial.py

@@ -2,7 +2,8 @@
 
 import uuid
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0002_jobresult_remove_jobrequest_completed_at_and_more.py

@@ -2,7 +2,8 @@
 
 import uuid
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0003_jobresult_status.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20231226225312 on 2023-12-28 19:28
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0007_alter_jobresult_status.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20231229213240 on 2023-12-30 02:35
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0008_jobrequest_source_jobresult_source.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240102205958 on 2024-01-02 21:12
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0009_alter_jobresult_status.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240109202955 on 2024-01-09 21:36
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0010_alter_jobresult_status.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240109225803 on 2024-01-09 23:17
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0011_jobrequest_retries_jobrequest_retry_attempt_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240109233227 on 2024-01-10 00:25
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0012_job_jobresult_job_uuid_alter_jobresult_status.py

@@ -2,7 +2,8 @@
 
 import uuid
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0013_alter_job_options_alter_jobresult_options_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240114170303 on 2024-01-17 19:24
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0014_job_unique_key_jobrequest_unique_key_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240117193239 on 2024-01-17 19:41
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0015_job_worker_uuid_jobresult_worker_uuid_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240118212224 on 2024-01-18 21:53
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0017_job_queue_jobrequest_queue_jobresult_queue.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240321171720 on 2024-03-21 18:47
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):

plain-worker/plain/worker/migrations/0018_jobrequest_unique_job_class_unique_key.py

@@ -1,6 +1,7 @@
 # Generated by Plain 5.0.dev20240514194324 on 2024-05-14 20:03
 
-from plain.models import migrations, models
+from plain import models
+from plain.models import migrations
 
 
 class Migration(migrations.Migration):