Merge pull request #3506 from open-formulieren/chore/cleanup-old-migr…

…ations ⚰️ Remove dead migration code
open-formulieren · Sep 27, 2023 · 83d9129 · 83d9129
2 parents c4bca1d + 804ca54
commit 83d9129
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 125 deletions.
diff --git a/src/openforms/conf/base.py b/src/openforms/conf/base.py
@@ -246,7 +246,6 @@
     "openforms.utils",
     "openforms.upgrades",
     "openforms.plugins",
-    "openforms.custom_field_types",  # TODO: remove completely after 2.1 is released
     "openforms.variables",
     # Apps registering static variables
     "openforms.variables.static_variables.apps.StaticVariables",

diff --git a/src/openforms/custom_field_types/__init__.py b/src/openforms/custom_field_types/__init__.py
diff --git a/src/openforms/custom_field_types/migrations/0001_initial.py b/src/openforms/custom_field_types/migrations/0001_initial.py
diff --git a/src/openforms/custom_field_types/migrations/0002_alter_familymemberstypeconfig_table.py b/src/openforms/custom_field_types/migrations/0002_alter_familymemberstypeconfig_table.py
diff --git a/src/openforms/custom_field_types/migrations/0003_delete_familymemberstypeconfig.py b/src/openforms/custom_field_types/migrations/0003_delete_familymemberstypeconfig.py
diff --git a/src/openforms/custom_field_types/migrations/__init__.py b/src/openforms/custom_field_types/migrations/__init__.py
diff --git a/src/openforms/formio/components/np_family_members/migrations/0001_initial.py b/src/openforms/formio/components/np_family_members/migrations/0001_initial.py
@@ -7,44 +7,35 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-        ("custom_field_types", "0002_alter_familymemberstypeconfig_table"),
-    ]
-
     operations = [
-        migrations.SeparateDatabaseAndState(
-            state_operations=[
-                migrations.CreateModel(
-                    name="FamilyMembersTypeConfig",
-                    fields=[
-                        (
-                            "id",
-                            models.AutoField(
-                                auto_created=True,
-                                primary_key=True,
-                                serialize=False,
-                                verbose_name="ID",
-                            ),
-                        ),
-                        (
-                            "data_api",
-                            models.CharField(
-                                choices=[
-                                    ("haal_centraal", "Haal Centraal"),
-                                    ("stuf_bg", "StufBg"),
-                                ],
-                                help_text="Which API to use to retrieve the data of the family members.",
-                                max_length=100,
-                                verbose_name="data api",
-                            ),
-                        ),
-                    ],
-                    options={
-                        "verbose_name": "Family members type configuration",
-                        "db_table": "custom_field_types_familymemberstypeconfig",
-                    },
+        migrations.CreateModel(
+            name="FamilyMembersTypeConfig",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "data_api",
+                    models.CharField(
+                        choices=[
+                            ("haal_centraal", "Haal Centraal"),
+                            ("stuf_bg", "StufBg"),
+                        ],
+                        help_text="Which API to use to retrieve the data of the family members.",
+                        max_length=100,
+                        verbose_name="data api",
+                    ),
                 ),
             ],
-            database_operations=[],
+            options={
+                "verbose_name": "Family members type configuration",
+                "db_table": "custom_field_types_familymemberstypeconfig",
+            },
         ),
     ]