Merge main into nextjs branch

.github/workflows/ci.yml

@@ -58,7 +58,7 @@ jobs:
 
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
         with:
-          python-version: "3.12.5"
+          python-version: "3.12.6"
           cache: "poetry"
 
       - name: Validate lockfile

.pre-commit-config.yaml

@@ -74,7 +74,7 @@ repos:
           - ".*/generated/"
         additional_dependencies: ["gibberish-detector"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.6.6"
+    rev: "v0.6.7"
     hooks:
       - id: ruff-format
       - id: ruff

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.5
+FROM python:3.12.6
 LABEL maintainer "ODL DevOps <mitx-devops@mit.edu>"
 
 # Add package files, install updated node and pip

RELEASE.rst

@@ -1,6 +1,56 @@
 Release Notes
 =============
 
+Version 0.20.3 (Released October 03, 2024)
+--------------
+
+- add is_incomplete_or_stale (#1627)
+- "unfollow" confirmation modal and "Unfollow All" button  (#1628)
+- raise SystemExit as a RetryError (#1635)
+
+Version 0.20.2 (Released October 01, 2024)
+--------------
+
+- remove border and shadow (#1636)
+- set card root to auto height (#1633)
+
+Version 0.20.1 (Released October 01, 2024)
+--------------
+
+- fix Safari MIT logo bug (#1631)
+- Retry recreate_index subtasks on worker exit (#1615)
+- Email for saved searches (#1619)
+
+Version 0.20.0 (Released October 01, 2024)
+--------------
+
+- updated header (#1622)
+- Switch to using full name (#1621)
+- Update dependency lxml to v5 (#1554)
+- Remove health checks against opensearch (#1620)
+- Add additional event capturing for some interactions (#1596)
+- Revert "changes for formatting search subscription emails"
+- changes for formatting search subscription emails
+- Add custom label for percolate query subscriptions (#1610)
+- Update Python to v3.12.6 (#1593)
+- [pre-commit.ci] pre-commit autoupdate (#1601)
+
+Version 0.19.6 (Released September 27, 2024)
+--------------
+
+- Add task_reject_on_worker_lost=True to finish_recreate_index, use return instead of raise for replaced tasks (#1608)
+
+Version 0.19.5 (Released September 26, 2024)
+--------------
+
+- Add separate field for ocw topics, use best field to assign related topics (#1600)
+
+Version 0.19.4 (Released September 25, 2024)
+--------------
+
+- new -> recently added (#1594)
+- Pace and format fields for learning resources (#1588)
+
 Version 0.19.3 (Released September 23, 2024)
 --------------
 

data_fixtures/migrations/0015_unit_page_copy_updates.py

@@ -0,0 +1,61 @@
+# Generated by Django 4.2.14 on 2024-07-16 17:30
+
+from django.db import migrations
+
+fixtures = [
+    {
+        "name": "mitpe",
+        "offeror_configuration": {
+            "value_prop": (
+                "MIT Professional Education is a leader in technology and "
+                "engineering education for working professionals pursuing "
+                "career advancement, and organizations seeking to meet modern-day "
+                "challenges by expanding the knowledge and skills of their employees. "
+                "Courses are delivered in a range of formats—in-person (on-campus "
+                "and live online), online, and through hybrid approaches—to "
+                "meet the needs of today's learners."
+            ),
+        },
+        "channel_configuration": {
+            "sub_heading": (
+                "MIT Professional Education is a leader in technology and "
+                "engineering education for working professionals pursuing "
+                "career advancement, and organizations seeking to meet modern-day "
+                "challenges by expanding the knowledge and skills of their employees. "
+                "Courses are delivered in a range of formats—in-person (on-campus "
+                "and live online), online, and through hybrid approaches—to "
+                "meet the needs of today's learners."
+            ),
+        },
+    },
+]
+
+
+def update_copy(apps, schema_editor):
+    Channel = apps.get_model("channels", "Channel")
+    LearningResourceOfferor = apps.get_model(
+        "learning_resources", "LearningResourceOfferor"
+    )
+    for fixture in fixtures:
+        channel_configuration_updates = fixture["channel_configuration"]
+        offeror_configuration_updates = fixture["offeror_configuration"]
+        channel = Channel.objects.get(name=fixture["name"])
+        if Channel.objects.filter(name=fixture["name"]).exists():
+            for key, val in channel_configuration_updates.items():
+                channel.configuration[key] = val
+            channel.save()
+        if LearningResourceOfferor.objects.filter(code=fixture["name"]).exists():
+            offeror = LearningResourceOfferor.objects.get(code=fixture["name"])
+            for key, val in offeror_configuration_updates.items():
+                setattr(offeror, key, val)
+            offeror.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("data_fixtures", "0014_add_department_SP"),
+    ]
+
+    operations = [
+        migrations.RunPython(update_copy, migrations.RunPython.noop),
+    ]

docker-compose.apps.yml

@@ -8,9 +8,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    extends:
-      file: docker-compose.opensearch.${OPENSEARCH_CLUSTER_TYPE:-single-node}.apps.yml
-      service: web
     mem_limit: 1gb
     cpus: 2
     command: ./scripts/run-django-dev.sh
@@ -54,14 +51,10 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    extends:
-      file: docker-compose.opensearch.${OPENSEARCH_CLUSTER_TYPE:-single-node}.apps.yml
-      service: web
     command: >
       /bin/bash -c '
       sleep 3;
-      celery -A main.celery:app worker -Q default -B -l ${MITOL_LOG_LEVEL:-INFO} &
-      celery -A main.celery:app worker -Q edx_content,default -l ${MITOL_LOG_LEVEL:-INFO}'
+      celery -A main.celery:app worker -E -Q default,edx_content -B -l ${MITOL_LOG_LEVEL:-INFO}'
     depends_on:
       db:
         condition: service_healthy

fixtures/common.py

@@ -44,7 +44,7 @@ def warnings_as_errors():  # noqa: PT004
         # Ignore deprecation warnings in third party libraries
         warnings.filterwarnings(
             "ignore",
-            module=".*(api_jwt|api_jws|rest_framework_jwt|astroid|celery|factory|botocore|posthog).*",
+            module=".*(api_jwt|api_jws|rest_framework_jwt|astroid|bs4|celery|factory|botocore|posthog).*",
             category=DeprecationWarning,
         )
         yield

frontends/api/src/generated/v0/api.ts

@@ -1597,12 +1597,6 @@ export interface PatchedChannelWriteRequest {
  * @interface PatchedProfileRequest
  */
 export interface PatchedProfileRequest {
-  /**
-   *
-   * @type {string}
-   * @memberof PatchedProfileRequest
-   */
-  name?: string | null
   /**
    *
    * @type {string}
@@ -1928,11 +1922,11 @@ export interface PreferencesSearch {
  */
 export interface Profile {
   /**
-   *
+   * Get the user\'s name
    * @type {string}
    * @memberof Profile
    */
-  name?: string | null
+  name: string
   /**
    *
    * @type {string}
@@ -2054,12 +2048,6 @@ export interface Profile {
  * @interface ProfileRequest
  */
 export interface ProfileRequest {
-  /**
-   *
-   * @type {string}
-   * @memberof ProfileRequest
-   */
-  name?: string | null
   /**
    *
    * @type {string}