fix: prevent migration ordering inconsistencies

Author: ormsbee

cms/djangoapps/contentstore/migrations/0015_alter_componentlink_upstream_block_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.10 on 2026-01-25 21:52
+
+import django.db.models.deletion
+from django.db import migrations, models
+from django.db.migrations.operations.special import SeparateDatabaseAndState
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentstore', '0014_remove_componentlink_downstream_is_modified_and_more'),
+        ('oel_authoring', '0001_initial'),
+    ]
+
+    operations = [
+        SeparateDatabaseAndState(
+            database_operations=[],
+            state_operations=[
+                migrations.AlterField(
+                    model_name='componentlink',
+                    name='upstream_block',
+                    field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='oel_authoring.component'),
+                ),
+                migrations.AlterField(
+                    model_name='containerlink',
+                    name='upstream_container',
+                    field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='oel_authoring.container'),
+                ),
+            ]
+        ),
+    ]

cms/djangoapps/modulestore_migrator/migrations/0007_alter_modulestoreblockmigration_change_log_record_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.2.10 on 2026-01-25 21:52
+
+import django.db.models.deletion
+from django.db import migrations, models
+from django.db.migrations.operations.special import SeparateDatabaseAndState
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('modulestore_migrator', '0006_alter_modulestoreblocksource_forwarded_and_more'),
+        ('oel_authoring', '0001_initial'),
+    ]
+
+    operations = [
+        SeparateDatabaseAndState(
+            database_operations=[],
+            state_operations=[
+                migrations.AlterField(
+                    model_name='modulestoreblockmigration',
+                    name='change_log_record',
+                    field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_authoring.draftchangelogrecord'),
+                ),
+                migrations.AlterField(
+                    model_name='modulestoreblockmigration',
+                    name='target',
+                    field=models.ForeignKey(blank=True, help_text='The target entity of this block migration, set to null if it fails to migrate', null=True, on_delete=django.db.models.deletion.CASCADE, to='oel_authoring.publishableentity'),
+                ),
+                migrations.AlterField(
+                    model_name='modulestoremigration',
+                    name='change_log',
+                    field=models.ForeignKey(help_text='Changelog entry in the target learning package which records this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_authoring.draftchangelog'),
+                ),
+                migrations.AlterField(
+                    model_name='modulestoremigration',
+                    name='target',
+                    field=models.ForeignKey(help_text='Content will be imported into this library', on_delete=django.db.models.deletion.CASCADE, to='oel_authoring.learningpackage'),
+                ),
+                migrations.AlterField(
+                    model_name='modulestoremigration',
+                    name='target_collection',
+                    field=models.ForeignKey(blank=True, help_text='Optional - Collection (within the target library) into which imported content will be grouped', null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_authoring.collection'),
+                ),
+            ]
+        ),
+    ]

cms/envs/common.py

@@ -45,7 +45,7 @@
 from datetime import timedelta
 
 from django.utils.translation import gettext_lazy as _
-from openedx_learning.api.django import learning_core_apps_to_install
+from openedx_learning.api.django import openedx_learning_apps_to_install
 
 from openedx.envs.common import *  # pylint: disable=wildcard-import
 
@@ -898,8 +898,7 @@ def make_lms_template_path(settings):
 
     'openedx_events',
 
-    # Learning Core Apps, used by v2 content libraries (content_libraries app)
-    *learning_core_apps_to_install(),
+    *openedx_learning_apps_to_install(),
 ]
 
 ### Apps only installed in some instances

lms/envs/common.py

@@ -60,7 +60,7 @@
     PROVISIONING_PENDING_ENTERPRISE_CUSTOMER_ADMIN_ROLE,
     DEFAULT_ENTERPRISE_ENROLLMENT_INTENTIONS_ROLE,
 )
-from openedx_learning.api.django import learning_core_apps_to_install
+from openedx_learning.api.django import openedx_learning_apps_to_install
 
 from openedx.core.lib.derived import Derived
 from openedx.envs.common import *  # pylint: disable=wildcard-import
@@ -2020,8 +2020,12 @@
 
     'openedx_events',
 
-    # Learning Core Apps, used by v2 content libraries (content_libraries app)
-    *learning_core_apps_to_install(),
+    # These go together as a unit.
+    *openedx_learning_apps_to_install(),
+    'cms.djangoapps.contentstore',
+    'cms.djangoapps.modulestore_migrator',
+    'openedx.core.djangoapps.content.search',
+    'openedx.core.djangoapps.content_staging',
 ]
 
 # Add LMS specific optional apps
@@ -2875,9 +2879,25 @@
 
 from edx_django_utils.plugins import get_plugin_apps, add_plugins  # pylint: disable=wrong-import-position,wrong-import-order
 from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType  # pylint: disable=wrong-import-position
+
+for app in INSTALLED_APPS:
+    if 'content_libraries' in app:
+        print("Found it before plugin application!")
+
 INSTALLED_APPS.extend(get_plugin_apps(ProjectType.LMS))
+
+for app in INSTALLED_APPS:
+    if 'content_libraries' in app:
+        print("Found it after extension!")
+
+
 add_plugins(__name__, ProjectType.LMS, SettingsType.COMMON)
 
+for app in INSTALLED_APPS:
+    if 'content_libraries' in app:
+        print("Found it after plugin application!")
+
+
 PROCTORED_EXAM_VIEWABLE_PAST_DUE = False
 
 ######################### rate limit for yt_video_metadata api ##############

openedx/core/djangoapps/content_libraries/migrations/0012_alter_contentlibrary_learning_package.py

@@ -2,19 +2,25 @@
 
 import django.db.models.deletion
 from django.db import migrations, models
+from django.db.migrations.operations.special import SeparateDatabaseAndState
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
         ('content_libraries', '0011_remove_contentlibrary_bundle_uuid_and_more'),
-        ('oel_authoring', '0002_rename_tables_to_oel_authoring'),
+        ('oel_authoring', '0001_initial'),
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name='contentlibrary',
-            name='learning_package',
-            field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.RESTRICT, to='oel_authoring.learningpackage'),
+        SeparateDatabaseAndState(
+            database_operations=[],
+            state_operations=[
+                migrations.AlterField(
+                    model_name='contentlibrary',
+                    name='learning_package',
+                    field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.RESTRICT, to='oel_authoring.learningpackage'),
+                ),
+            ]
         ),
     ]