Merge branch 'openedx:master' into master

.dockerignore

@@ -89,7 +89,6 @@ test_root/paver_logs/
 test_root/uploads/
 **/django-pyfs
 **/.tox/
-common/test/db_cache/bok_choy_*.yaml
 common/test/data/badges/*.png
 
 ### Installation artifacts

.github/CODEOWNERS

@@ -2,23 +2,25 @@
 
 # Ensure that the team responsible for upgrades sees any PRs that would
 # add GitHub-hosted dependencies to that platform.
-requirements/edx/github.in                                          @openedx/arbi-bom
+requirements/edx/github.in                                          @openedx/2u-arbi-bom
 
 # Core
 common/djangoapps/student/
-common/djangoapps/student/models/__init__.py                        @openedx/teaching-and-learning
-common/djangoapps/student/models/course_enrollment.py               @openedx/teaching-and-learning
+common/djangoapps/student/models/__init__.py                        @openedx/2u-tnl
+common/djangoapps/student/models/course_enrollment.py               @openedx/2u-tnl
 common/djangoapps/third_party_auth/
 lms/djangoapps/course_api/blocks
 lms/djangoapps/courseware/
 lms/djangoapps/grades/
 lms/djangoapps/instructor/
 lms/djangoapps/instructor_task/
 lms/djangoapps/mobile_api/
+openedx/core/djangoapps/credentials                                 @openedx/2U-aperture
+openedx/core/djangoapps/credit                                      @openedx/2U-aperture
 openedx/core/djangoapps/heartbeat/
 openedx/core/djangoapps/oauth_dispatch
-openedx/core/djangoapps/user_api/
-openedx/core/djangoapps/user_authn/
+openedx/core/djangoapps/user_api/                                   @openedx/2U-aperture
+openedx/core/djangoapps/user_authn/                                 @openedx/2U-vanguards                                 
 openedx/features/course_experience/
 xmodule/
 
@@ -30,23 +32,23 @@ lms/djangoapps/edxnotes
 common/djangoapps/track/
 
 # Credentials
-lms/djangoapps/certificates/
+lms/djangoapps/certificates/                                        @openedx/2U-aperture
 
 # Discovery
 common/djangoapps/course_modes/
 common/djangoapps/enrollment/
 lms/djangoapps/commerce/
 lms/djangoapps/experiments/
-lms/djangoapps/learner_dashboard/
-lms/djangoapps/learner_home/
+lms/djangoapps/learner_dashboard/                                    @openedx/2U-aperture
+lms/djangoapps/learner_home/                                         @openedx/2U-aperture
 openedx/features/content_type_gating/
 openedx/features/course_duration_limits/
 openedx/features/discounts/
 
 # Ping Axim On-call if someone uses the QuickStart
 # https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html
-lms/templates/dashboard.html               @openedx/axim-oncall
+lms/templates/dashboard.html                                         @openedx/axim-oncall
 
 # Ensure minimal.yml stays minimal, this could be a team in the future
 # but it's just me for now, others can sign up if they care as well.
-lms/envs/minimal.yml                                            @feanil
+lms/envs/minimal.yml                                                 @feanil

.github/dependabot.yml

@@ -7,3 +7,15 @@ updates:
         interval: "weekly"
     reviewers:
       - "openedx/arbi-bom"
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/unit-tests/"
+    schedule:
+        interval: "weekly"
+    reviewers:
+      - "openedx/arbi-bom"
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/verify-tests-count/"
+    schedule:
+        interval: "weekly"
+    reviewers:
+      - "openedx/arbi-bom"

.github/pull_request_template.md

@@ -6,8 +6,6 @@
 🌳🌳🌳🌳         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
 🌳🌳
 
-🌴🌴🌴🌴🌴🌴     🌴 Note: the Palm release is still supported.
-                Please consider whether your change should be applied to Palm as well.
 
 Please give your pull request a short but descriptive title.
 Use conventional commits to separate and summarize commits logically:

.github/workflows/docker-publish.yml

@@ -30,7 +30,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
            username: ${{ secrets.DOCKERHUB_USERNAME }}
            password: ${{ secrets.DOCKERHUB_PASSWORD }}

.github/workflows/js-tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        node-version: [ 16 ]
+        node-version: [ 18 ]
         python-version: [ 3.8 ]
 
     steps:
@@ -23,18 +23,18 @@ jobs:
       run: git fetch --depth=1 origin master
 
     - name: Setup Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
     - name: Setup npm
-      run: npm i -g npm@8.5.x
+      run: npm i -g npm@10.5.x
 
-    - name: Install Firefox 61.0
+    - name: Install Firefox 123.0
       run: |
         sudo apt-get purge firefox
-        wget "https://ftp.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-US/firefox-61.0.tar.bz2"
-        tar -xjf firefox-61.0.tar.bz2
+        wget "https://ftp.mozilla.org/pub/firefox/releases/123.0/linux-x86_64/en-US/firefox-123.0.tar.bz2"
+        tar -xjf firefox-123.0.tar.bz2
         sudo mv firefox /opt/firefox
         sudo ln -s /opt/firefox/firefox /usr/bin/firefox
 

.github/workflows/lockfileversion-check.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
+    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master

.github/workflows/migrations-check.yml

@@ -16,25 +16,20 @@ jobs:
         os: [ ubuntu-20.04 ]
         python-version: [ 3.8 ]
         # 'pinned' is used to install the latest patch version of Django
-        # within the global constraint i.e. Django==3.2.21 in current case
+        # within the global constraint i.e. Django==4.2.8 in current case
         # because we have global constraint of Django<4.2 
-        django-version: ["pinned", "4.2"]
-        mongo-version: ["4"]
-        mysql-version: ["5.7", "8"]
-        # excluding mysql5.7 with Django 4.2 since Django 4.2 has 
-        # dropped support for MySQL<8
-        exclude:
-          - django-version: "4.2"
-            mysql-version: "5.7"
+        django-version: ["pinned"]
+        mongo-version: ["4", "7"]
+        mysql-version: ["8"]
     services:
       mongo:
         image: mongo:${{ matrix.mongo-version }}
         ports:
           - 27017:27017
         # Note: Calling mongo here only works with mongo 4, in newer versions of mongo
-        # we'll have to use `mongosh`
+        # we'll have to use `mongosh`, hence the 'which mongosh mongo'.
         options: >-
-          --health-cmd "mongo --quiet --eval 'db.runCommand(\"ping\")'"
+          --health-cmd "$(which mongosh mongo) --quiet --eval 'db.runCommand(\"ping\")'"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 3

.github/workflows/publish-ci-docker-image.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Log in to ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build, tag, and push image to Amazon ECR
         env:

.github/workflows/pylint-checks.yml

@@ -16,7 +16,7 @@ jobs:
           - module-name: lms-1
             path: "--django-settings-module=lms.envs.test lms/djangoapps/badges/ lms/djangoapps/branding/ lms/djangoapps/bulk_email/ lms/djangoapps/bulk_enroll/ lms/djangoapps/bulk_user_retirement/ lms/djangoapps/ccx/ lms/djangoapps/certificates/ lms/djangoapps/commerce/ lms/djangoapps/course_api/ lms/djangoapps/course_blocks/ lms/djangoapps/course_home_api/ lms/djangoapps/course_wiki/ lms/djangoapps/coursewarehistoryextended/ lms/djangoapps/debug/ lms/djangoapps/courseware/ lms/djangoapps/course_goals/ lms/djangoapps/rss_proxy/"
           - module-name: lms-2
-            path: "--django-settings-module=lms.envs.test lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/email_marketing/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_recommendations/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py"
+            path: "--django-settings-module=lms.envs.test lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/email_marketing/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py"
           - module-name: openedx-1
             path: "--django-settings-module=lms.envs.test openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/demographics/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/tests/ openedx/core/djangoapps/course_live/"
           - module-name: openedx-2

.github/workflows/quality-checks.yml

@@ -35,7 +35,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Setup Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -65,7 +65,6 @@ jobs:
       env:
         TEST_SUITE: quality
         SCRIPT_TO_RUN: ./scripts/generic-ci-tests.sh
-        SHARD: 4
         PIP_SRC: ${{ runner.temp }}
         TARGET_BRANCH: ${{ github.base_ref }}
       run: |

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

@@ -14,8 +14,22 @@ jobs:
       matrix:
         os: [ ubuntu-20.04 ]
         python-version: [ 3.8 ]
-        node-version: [ 16 ]
-        npm-version: [ 8.5.x ]
+        node-version: [ 18 ]
+        npm-version: [ 10.5.x ]
+        mongo-version: ["4.4", "7.0"]
+
+    services:
+      mongo:
+        image: mongo:${{ matrix.mongo-version }}
+        ports:
+          - 27017:27017
+        # Note: Calling mongo here only works with mongo 4, in newer versions of mongo
+        # we'll have to use `mongosh`, hence the 'which mongosh mongo'.
+        options: >-
+          --health-cmd "$(which mongosh mongo) --quiet --eval 'db.runCommand(\"ping\")'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 3
 
     steps:
     - name: Checkout repo
@@ -32,7 +46,7 @@ jobs:
         sudo apt-get install libxmlsec1-dev pkg-config
 
     - name: Setup Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -64,9 +78,9 @@ jobs:
 
     - name: Run Static Assets Check
       env:
-        LMS_CFG: lms/envs/bok_choy.yml
-        CMS_CFG: cms/envs/bok_choy.yml
+        LMS_CFG: lms/envs/minimal.yml
+        CMS_CFG: lms/envs/minimal.yml
 
       run: |
-        paver update_assets lms
-        paver update_assets cms
+        paver update_assets lms --theme-dirs ./themes
+        paver update_assets cms --theme-dirs ./themes

.github/workflows/unit-test-shards.json

@@ -53,7 +53,6 @@
       "lms/djangoapps/instructor_task/",
       "lms/djangoapps/learner_dashboard/",
       "lms/djangoapps/learner_home/",
-      "lms/djangoapps/learner_recommendations/",
       "lms/djangoapps/lms_initialization/",
       "lms/djangoapps/lms_xblock/",
       "lms/djangoapps/lti_provider/",

.github/workflows/unit-tests-gh-hosted.yml

@@ -36,7 +36,10 @@ jobs:
           - "common-with-cms"
           - "xmodule-with-lms"
           - "xmodule-with-cms"
-    name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
+        mongo-version:
+          - "4.4"
+          - "7.0"
+    name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},mongo-${{ matrix.mongo-version }}${{ matrix.shard_name }}
     steps:
       - uses: actions/checkout@v2
 
@@ -46,7 +49,7 @@ jobs:
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.7.0
         with:
-          mongodb-version: 4.4
+          mongodb-version: ${{ matrix.mongo-version}}
 
       - name: Setup Python
         uses: actions/setup-python@v4

.github/workflows/unit-tests.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   run-tests:
-    name: python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
+    name: python-${{ matrix.python-version }},django-${{ matrix.django-version }},mongo-${{ matrix.mongo-version }},${{ matrix.shard_name }}
     if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     runs-on: [ edx-platform-runner ]
     strategy:
@@ -17,7 +17,6 @@ jobs:
           - "3.8"
         django-version:
           - "pinned"
-          - "4.2"
         # When updating the shards, remember to make the same changes in
         # .github/workflows/unit-tests-gh-hosted.yml
         shard_name:
@@ -37,13 +36,26 @@ jobs:
           - "common-with-cms"
           - "xmodule-with-lms"
           - "xmodule-with-cms"
+        mongo-version:
+          - "4.4"
+          - "7.0"
     # We expect Django 4.0 to fail, so don't stop when it fails.
     continue-on-error: ${{ matrix.django-version == '4.0' }}
 
     steps:
       - name: sync directory owner
         run: sudo chown runner:runner -R .*
 
+      - name: install mongo version
+        run: |
+          if [[ "${{ matrix.mongo-version }}" != "4.4" ]]; then
+            sudo apt-get purge -y "mongodb-org*"
+            sudo apt-get remove -y mongodb-org
+            wget -qO - https://www.mongodb.org/static/pgp/server-${{ matrix.mongo-version }}.asc | sudo apt-key add -
+            echo "deb https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/${{ matrix.mongo-version }} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${{ matrix.mongo-version }}.list
+            sudo apt-get update && sudo apt-get install -y mongodb-org="${{ matrix.mongo-version }}.*"
+          fi
+
       - name: checkout repo
         uses: actions/checkout@v3
 

.github/workflows/units-test-scripts-structures-pruning.yml

@@ -0,0 +1,33 @@
+name: units-test-scripts-common
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [ '3.8', '3.12' ]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r scripts/structures_pruning/requirements/testing.txt
+
+      - name: Run pytest
+        run: |
+          pytest scripts/structures_pruning

.github/workflows/units-test-scripts-user-retirement.yml

@@ -0,0 +1,33 @@
+name: units-test-scripts-user-retirement
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [ '3.8' ]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r scripts/user_retirement/requirements/testing.txt
+
+      - name: Run pytest
+        run: |
+          pytest scripts/user_retirement