providers/scim: fix migration graph by rebasing main and adjusting order

ImmanuelVonNeumann · ImmanuelVonNeumann · commit 6ee9884c0d71 · 2025-03-21T10:24:44.000+01:00
diff --git a/authentik/providers/scim/migrations/0014_scimprovider_filter_groups_and_more.py b/authentik/providers/scim/migrations/0014_scimprovider_filter_groups_and_more.py
@@ -8,7 +8,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("authentik_core", "0043_alter_group_options"),
-        ("authentik_providers_scim", "0012_scimprovider_compatibility_mode"),
+        ("authentik_providers_scim", "0013_scimprovidergroup_attributes_and_more"),
     ]
 
     operations = [
diff --git a/authentik/providers/scim/migrations/0015_scimprovider_migrate_filter_groups.py b/authentik/providers/scim/migrations/0015_scimprovider_migrate_filter_groups.py
@@ -19,7 +19,7 @@ def make_many_groups(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("authentik_providers_scim", "0013_scimprovider_filter_groups_and_more"),
+        ("authentik_providers_scim", "0014_scimprovider_filter_groups_and_more"),
     ]
 
     operations = [migrations.RunPython(make_many_groups)]
diff --git a/authentik/providers/scim/migrations/0016_remove_scimprovider_filter_group_and_more.py b/authentik/providers/scim/migrations/0016_remove_scimprovider_filter_group_and_more.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("authentik_providers_scim", "0014_scimprovider_migrate_filter_groups"),
+        ("authentik_providers_scim", "0015_scimprovider_migrate_filter_groups"),
     ]
 
     operations = [

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class Migration(migrations.Migration):`
`8`	`8`
`9`	`9`	`dependencies = [`
`10`	`10`	`("authentik_core", "0043_alter_group_options"),`
`11`		`- ("authentik_providers_scim", "0012_scimprovider_compatibility_mode"),`
	`11`	`+ ("authentik_providers_scim", "0013_scimprovidergroup_attributes_and_more"),`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`operations = [`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ def make_many_groups(apps, schema_editor):`
`19`	`19`	`class Migration(migrations.Migration):`
`20`	`20`
`21`	`21`	`dependencies = [`
`22`		`- ("authentik_providers_scim", "0013_scimprovider_filter_groups_and_more"),`
	`22`	`+ ("authentik_providers_scim", "0014_scimprovider_filter_groups_and_more"),`
`23`	`23`	`]`
`24`	`24`
`25`	`25`	`operations = [migrations.RunPython(make_many_groups)]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`class Migration(migrations.Migration):`
`7`	`7`
`8`	`8`	`dependencies = [`
`9`		`- ("authentik_providers_scim", "0014_scimprovider_migrate_filter_groups"),`
	`9`	`+ ("authentik_providers_scim", "0015_scimprovider_migrate_filter_groups"),`
`10`	`10`	`]`
`11`	`11`
`12`	`12`	`operations = [`