test: DO NOT MERGE - Dummy PR to track upstream master

.github/workflows/js-tests.yml

@@ -73,7 +73,7 @@ jobs:
           npm run test
 
       - name: Save Job Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Build-Artifacts
           path: |

.github/workflows/quality-checks.yml

@@ -85,7 +85,7 @@ jobs:
 
       - name: Save Job Artifacts
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Build-Artifacts
           path: |

.github/workflows/static-assets-check.yml

@@ -98,7 +98,6 @@ jobs:
         env:
           LMS_CFG: lms/envs/minimal.yml
           CMS_CFG: lms/envs/minimal.yml
-          DJANGO_SETTINGS_MODULE: lms.envs.production
         run: |
-          ./manage.py lms collectstatic --noinput
-          ./manage.py cms collectstatic --noinput
+          DJANGO_SETTINGS_MODULE=lms.envs.production ./manage.py lms collectstatic --noinput
+          DJANGO_SETTINGS_MODULE=cms.envs.production ./manage.py cms collectstatic --noinput

.github/workflows/unit-tests.yml

@@ -131,7 +131,7 @@ jobs:
 
       - name: save pytest warnings json file
         if: success()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: pytest-warnings-json-${{ matrix.shard_name }}-${{ matrix.python-version }}-${{ matrix.django-version }}-${{ matrix.mongo-version }}-${{ matrix.os-version }}
           path: |
@@ -143,7 +143,7 @@ jobs:
           mv reports/.coverage reports/${{ matrix.shard_name }}_${{ matrix.python-version }}_${{ matrix.django-version }}_${{ matrix.mongo-version }}_${{ matrix.os-version }}.coverage
 
       - name: Upload coverage
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-${{ matrix.shard_name }}-${{ matrix.python-version }}-${{ matrix.django-version }}-${{ matrix.mongo-version }}-${{ matrix.os-version }}
           path: reports/${{ matrix.shard_name }}_${{ matrix.python-version }}_${{ matrix.django-version }}_${{ matrix.mongo-version }}_${{ matrix.os-version }}.coverage
@@ -230,7 +230,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: collect pytest warnings files
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           pattern: pytest-warnings-json-*
           merge-multiple: true
@@ -245,7 +245,7 @@ jobs:
 
       - name: save warning report
         if: success()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: pytest-warning-report-html
           path: |
@@ -257,14 +257,14 @@ jobs:
     needs: [compile-warnings-report]
     steps:
       - name: Merge Pytest Warnings JSON Artifacts
-        uses: actions/upload-artifact/merge@v6
+        uses: actions/upload-artifact/merge@v7
         with:
           name: pytest-warnings-json
           pattern: pytest-warnings-json-*
           delete-merged: true
 
       - name: Merge Coverage Artifacts
-        uses: actions/upload-artifact/merge@v6
+        uses: actions/upload-artifact/merge@v7
         with:
           name: coverage
           pattern: coverage-*
@@ -289,7 +289,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           pattern: coverage-*
           merge-multiple: true

.gitignore

@@ -13,6 +13,7 @@ lms/envs/private.py
 cms/envs/private.py
 .venv/
 CLAUDE.md
+.claude/
 AGENTS.md
 # end-noclean
 

cms/djangoapps/contentstore/migrations/0001_squashed_0015_switch_to_openedx_content.py

@@ -3,8 +3,8 @@
 import django.db.migrations.operations.special
 import django.db.models.deletion
 import opaque_keys.edx.django.models
-import openedx_learning.lib.fields
-import openedx_learning.lib.validators
+import openedx_django_lib.fields
+import openedx_django_lib.validators
 import uuid
 from django.conf import settings
 from django.db import migrations, models
@@ -107,8 +107,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('context_key', opaque_keys.edx.django.models.CourseKeyField(help_text='Linking status for course context key', max_length=255, unique=True)),
                 ('status', models.CharField(choices=[('pending', 'Pending'), ('processing', 'Processing'), ('failed', 'Failed'), ('completed', 'Completed')], help_text='Status of links in given learning context/course.', max_length=20)),
-                ('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
-                ('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
+                ('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
+                ('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
             ],
             options={
                 'verbose_name': 'Learning Context Links status',
@@ -121,13 +121,13 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True, verbose_name='UUID')),
                 ('upstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(help_text='Upstream block usage key, this value cannot be null and useful to track upstream library blocks that do not exist yet', max_length=255)),
-                ('upstream_context_key', openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
+                ('upstream_context_key', openedx_django_lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
                 ('downstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(max_length=255, unique=True)),
                 ('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
                 ('version_synced', models.IntegerField()),
                 ('version_declined', models.IntegerField(blank=True, null=True)),
-                ('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
-                ('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
+                ('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
+                ('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
                 ('upstream_block', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='openedx_content.component')),
             ],
             options={
@@ -140,13 +140,13 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True, verbose_name='UUID')),
-                ('upstream_context_key', openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
+                ('upstream_context_key', openedx_django_lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
                 ('downstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(max_length=255, unique=True)),
                 ('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
                 ('version_synced', models.IntegerField()),
                 ('version_declined', models.IntegerField(blank=True, null=True)),
-                ('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
-                ('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
+                ('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
+                ('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
                 ('upstream_container_key', opaque_keys.edx.django.models.ContainerKeyField(help_text='Upstream block key (e.g. lct:...), this value cannot be null and is useful to track upstream library blocks that do not exist yet or were deleted.', max_length=255)),
                 ('upstream_container', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='openedx_content.container')),
             ],

cms/djangoapps/contentstore/migrations/0009_learningcontextlinksstatus_publishableentitylink.py

@@ -4,8 +4,8 @@
 
 import django.db.models.deletion
 import opaque_keys.edx.django.models
-import openedx_learning.lib.fields
-import openedx_learning.lib.validators
+import openedx_django_lib.fields
+import openedx_django_lib.validators
 from django.db import migrations, models
 
 
@@ -39,8 +39,8 @@ class Migration(migrations.Migration):
                         max_length=20,
                     ),
                 ),
-                ('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
-                ('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
+                ('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
+                ('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
             ],
             options={
                 'verbose_name': 'Learning Context Links status',
@@ -61,7 +61,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     'upstream_context_key',
-                    openedx_learning.lib.fields.MultiCollationCharField(
+                    openedx_django_lib.fields.MultiCollationCharField(
                         db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'},
                         db_index=True,
                         help_text='Upstream context key i.e., learning_package/library key',
@@ -72,8 +72,8 @@ class Migration(migrations.Migration):
                 ('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
                 ('version_synced', models.IntegerField()),
                 ('version_declined', models.IntegerField(blank=True, null=True)),
-                ('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
-                ('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
+                ('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
+                ('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
                 (
                     'upstream_block',
                     models.ForeignKey(

cms/djangoapps/contentstore/migrations/0010_container_link_models.py

@@ -3,8 +3,8 @@
 
 import django.db.models.deletion
 import opaque_keys.edx.django.models
-import openedx_learning.lib.fields
-import openedx_learning.lib.validators
+import openedx_django_lib.fields
+import openedx_django_lib.validators
 from django.db import migrations, models
 
 
@@ -40,13 +40,13 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True, verbose_name='UUID')),
-                ('upstream_context_key', openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
+                ('upstream_context_key', openedx_django_lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_index=True, help_text='Upstream context key i.e., learning_package/library key', max_length=500)),
                 ('downstream_usage_key', opaque_keys.edx.django.models.UsageKeyField(max_length=255, unique=True)),
                 ('downstream_context_key', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)),
                 ('version_synced', models.IntegerField()),
                 ('version_declined', models.IntegerField(blank=True, null=True)),
-                ('created', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
-                ('updated', models.DateTimeField(validators=[openedx_learning.lib.validators.validate_utc_datetime])),
+                ('created', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
+                ('updated', models.DateTimeField(validators=[openedx_django_lib.validators.validate_utc_datetime])),
                 ('upstream_container_key', opaque_keys.edx.django.models.ContainerKeyField(help_text='Upstream block key (e.g. lct:...), this value cannot be null and is useful to track upstream library blocks that do not exist yet or were deleted.', max_length=255)),
                 ('upstream_container', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='links', to='oel_publishing.container')),
             ],

cms/djangoapps/contentstore/models.py

@@ -15,9 +15,9 @@
 from opaque_keys.edx.django.models import ContainerKeyField, CourseKeyField, UsageKeyField
 from opaque_keys.edx.keys import CourseKey, UsageKey
 from opaque_keys.edx.locator import LibraryContainerLocator
-from openedx_learning.api.authoring import get_published_version
-from openedx_learning.api.authoring_models import Component, Container
-from openedx_learning.lib.fields import (
+from openedx_content.api import get_published_version
+from openedx_content.models_api import Component, Container
+from openedx_django_lib.fields import (
     immutable_uuid_field,
     key_field,
     manual_date_time_field,
@@ -97,9 +97,9 @@ class EntityLinkBase(models.Model):
     )
     # A downstream entity can only link to single upstream entity
     # whereas an entity can be upstream for multiple downstream entities.
-    downstream_usage_key = UsageKeyField(max_length=255, unique=True)
+    downstream_usage_key = UsageKeyField(unique=True)
     # Search by course/downstream key
-    downstream_context_key = CourseKeyField(max_length=255, db_index=True)
+    downstream_context_key = CourseKeyField(db_index=True)
     # This is present if the creation of this link is a consequence of
     # importing a container that has one or more levels of children.
     # This represents the parent (container) in the top level
@@ -152,7 +152,6 @@ class ComponentLink(EntityLinkBase):
         blank=True,
     )
     upstream_usage_key = UsageKeyField(
-        max_length=255,
         help_text=_(
             "Upstream block usage key, this value cannot be null"
             " and useful to track upstream library blocks that do not exist yet"
@@ -324,7 +323,6 @@ class ContainerLink(EntityLinkBase):
         blank=True,
     )
     upstream_container_key = ContainerKeyField(
-        max_length=255,
         help_text=_(
             "Upstream block key (e.g. lct:...), this value cannot be null "
             "and is useful to track upstream library blocks that do not exist yet "
@@ -564,7 +562,6 @@ class LearningContextLinksStatus(models.Model):
     course or a learning context.
     """
     context_key = CourseKeyField(
-        max_length=255,
         # Single entry for a learning context or course
         unique=True,
         help_text=_("Linking status for course context key"),