Update Tahoe Nutmeg upgrade branch with changes from main

.github/CODEOWNERS

@@ -3,7 +3,7 @@
 
 
 # default code owner
-* @omarithawi
+* @bryanlandia
 
 # default set of reviewers
-* @omarithawi @melvinsoft @thraxil @shadinaif
+* @amirtds @xscrio

.github/workflows/push.yml

@@ -18,7 +18,7 @@ jobs:
           PULL_REQUEST_BODY: |
             This is an automated pull request from branch `hawthorn/main` into `hawthorn/prod` (production).
             Please review the changes and merge this pull request _before_ running the Tahoe production Cloud Build deployment.
-          PULL_REQUEST_REVIEWERS: "johnbaldwin amirtds bryanlandia"
+          PULL_REQUEST_REVIEWERS: "amirtds bryanlandia xscrio" 
   hawthorn-to-juniper-sync:
     name: PullRequestAction
     runs-on: ubuntu-latest
@@ -35,5 +35,5 @@ jobs:
             This is meant for making sure all of our Hawthorn changes gets merge into Juniper otherwise Juniper would stall.
             If tests passes merge this pull request.
             If there are merge conflicts, it needs to be resolved manually in a seperate pull request.
-          PULL_REQUEST_REVIEWERS: "melvinsoft shadinaif OmarIthawi thraxil"
+          PULL_REQUEST_REVIEWERS: "bryanlandia amirtds xscrio"
 

.github/workflows/report_conflicts.yml

@@ -2,13 +2,13 @@ on: [pull_request]
 name: 'Merge conflicts'
 
 jobs:
-  report_master:
-    name: 'koa, lilac, maple, nutmeg and master'
+  report:
+    name: 'nutmeg and master'
     uses: appsembler/action-conflict-counter/.github/workflows/report-via-comment.yml@main
     with:
       local_base_branch: ${{ github.base_ref }}
-      upstream_repo: 'https://github.com/edx/edx-platform.git'
-      upstream_branches: 'open-release/koa.master,open-release/lilac.master,open-release/maple.master,open-release/nutmeg.master,master'
+      upstream_repo: 'https://github.com/openedx/edx-platform.git'
+      upstream_branches: 'open-release/nutmeg.master,master'
       exclude_paths: 'cms/static/js/,conf/locale/,lms/static/js/,package.json,package-lock.json,.github/'
     secrets:
       custom_github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync_nutmeg_with_juniper.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: pull-request-action
-        uses: vsoch/pull-request-action@1.0.19
+        uses: vsoch/pull-request-action@1.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH_PREFIX: "main"

.github/workflows/sync_prod_with_main.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: pull-request-action
-        uses: vsoch/pull-request-action@1.0.19
+        uses: vsoch/pull-request-action@1.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH_PREFIX: "main"
           PULL_REQUEST_BRANCH: "prod"
           PULL_REQUEST_TITLE: "Update from `main` (production)"
-          PULL_REQUEST_REVIEWERS: "melvinsoft OmarIthawi thraxil shadinaif"
+          PULL_REQUEST_REVIEWERS: "VladyslavTy daniilly"

.github/workflows/tests.yml

@@ -24,6 +24,8 @@ jobs:
           - lms-1
           - lms-2
           - mte
+          - legacy-amc-tests
+          - db-migrations
           - studio
 
     steps:
@@ -32,6 +34,8 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+      env:
+        PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
     - name: Install dependencies
       # TODO: Remove tox-pip-version once we upgrade to Koa+, or whenever we have addressed pip 20.3 strict issues.
       run: |

Dockerfile.tutor

@@ -17,23 +17,25 @@ RUN pip install -r ./requirements/edx/base.txt  \
 
 # Sync with `edx-configs` `appsembler/tahoe/us/juniper/prod/files/server-vars.yml`
 RUN echo "Installing pip packages:" \
-    && pip install openedx-scorm-xblock==10.4.0 \
-    && pip install xblock-launchcontainer==2.3.1 \
+    && pip install xblock-launchcontainer==4.0.0 \
     && pip install xblock-prismjs==0.1.4 \
     && pip install xblock-problem-builder==4.1.9 \
     && echo \
+    && pip install https://github.com/appsembler/openedx-scorm-xblock/archive/refs/tags/v15.1.0-appsembler-tahoe-compat.tar.gz \
     && pip install https://github.com/appsembler/pdfXBlock/archive/v0.3.1.tar.gz \
     && pip install https://github.com/edx/xblock-free-text-response/archive/4149cc450.tar.gz \
     && pip install https://github.com/pmitros/FeedbackXBlock/archive/v1.1.tar.gz \
     && pip install https://github.com/ubc/ubcpi/archive/1.0.0.tar.gz \
     && echo \
-    && pip install course-access-groups==0.5.4 \
-    && pip install figures==0.4.1 \
+    && pip install course-access-groups==0.6.1 \
+    && pip install figures==0.4.4 \
     && pip install tahoe-figures-plugins==0.1.1  \
     && pip install tahoe-lti==0.3.0 \
-    && pip install tahoe-scorm==0.1.2 \
+    && pip install tahoe-scorm==0.1.4 \
+    && pip install xblock-grade-fetcher==0.5.0 \
+    && pip install django-manage-admins==0.1.0 \
     && echo \
-    && pip install https://github.com/appsembler/openedx-completion-aggregator/archive/3.0.3-2021-may-18-bug-fixes.tar.gz \
+    && pip install https://github.com/appsembler/openedx-completion-aggregator/archive/3.0.3-2023-mar-27-revert-use-of-task-track.tar.gz \
     && echo "Finished installing pip packages."
 
 EXPOSE 8000

cms/djangoapps/appsembler/apps.py

@@ -0,0 +1,14 @@
+"""
+Appsembler CMS App Configuration
+"""
+
+
+from django.apps import AppConfig
+
+
+class CMSAppsemblerConfig(AppConfig):
+    """
+    Application Configuration for Badges.
+    """
+    name = u'appsembler'
+    plugin_app = {}

cms/djangoapps/appsembler/management/commands/cms_remove_stray_courses.py

@@ -0,0 +1,100 @@
+"""
+Command to remove courses without associated organization.
+
+This command is intended as a follow-up step after `remove_site` but can be run independently.
+"""
+
+from django.core.management.base import BaseCommand, CommandError
+from django.conf import settings
+from opaque_keys.edx.keys import CourseKey
+
+from xmodule.contentstore.django import contentstore
+from xmodule.modulestore import ModuleStoreEnum
+from xmodule.modulestore.django import modulestore
+
+from contentstore.utils import delete_course
+
+from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.appsembler.sites.deletion_utils import (
+    confirm_deletion,
+)
+
+
+def get_deletable_course_keys_from_mongo():
+    """
+    Get keys of courses without active organization.
+    """
+    mongodb_course_keys = {str(mongodb_course.id) for mongodb_course in modulestore().get_course_summaries()}
+    mysql_course_keys = {str(mysql_course_key) for mysql_course_key in CourseOverview.get_all_course_keys()}
+    return list(mongodb_course_keys - mysql_course_keys)
+
+
+def delete_course_and_assets(course_key):
+    """
+    Delete all courses without active organization.
+    """
+    course_key_obj = CourseKey.from_string(course_key)
+    delete_course(course_key_obj, ModuleStoreEnum.UserID.mgmt_command, keep_instructors=False)
+    contentstore().delete_all_course_assets(course_key_obj)
+
+
+def cms_remove_stray_courses(commit, limit):
+    """
+    Remove all courses from mongodb that has no CourseOverview entry in MySQL.
+    """
+    course_keys = get_deletable_course_keys_from_mongo()
+    if limit:
+        course_keys = course_keys[:limit]
+
+    if not course_keys:
+        raise CommandError('No courses found to delete.')
+
+    str_course_list = [str(course_key) for course_key in course_keys]
+    print('Preparing to delete:')
+    print('\n'.join(str_course_list))
+    commit = confirm_deletion(
+        question='Do you confirm to delete the courses from CMS?',
+        commit=commit,
+    )
+
+    for course_key in course_keys:
+        if commit:
+            print('Deleting course: {}'.format(course_key))
+            delete_course_and_assets(course_key)
+        else:
+            print('[Dry run] deleting course: {}'.format(course_key))
+
+    print('Finished removing deletable courses')
+
+
+class Command(BaseCommand):
+    help = "Delete courses that don't belong to organization in `get_active_organizations()`."
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--limit',
+            dest='limit',
+            default=1,
+            type=int,
+            help='Max courses to delete, use 0 to delete all courses.',
+        )
+
+        parser.add_argument(
+            '--commit',
+            dest='commit',
+            action='store_true',
+            help='Remove courses, otherwise only the log will be printed.',
+        )
+
+        parser.add_argument(
+            '--dry-run',
+            dest='commit',
+            action='store_false',
+            help='Do not remove courses, only print the logs.',
+        )
+
+    def handle(self, *args, **options):
+        if settings.ROOT_URLCONF != 'cms.urls':
+            raise CommandError('This command can only be run in CMS.')
+
+        cms_remove_stray_courses(commit=options.get('commit'), limit=options['limit'])

cms/djangoapps/appsembler/tests/test_deletion_command.py

@@ -0,0 +1,35 @@
+"""
+
+"""
+
+from django.core.management import call_command, CommandError
+
+from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+class DeletionCommandTestCase(ModuleStoreTestCase):
+    def test_cms_remove_stray_courses_command_no_courses(self):
+        """
+        Raise CommandError if there's no courses to delete.
+        """
+        with self.assertRaises(CommandError):
+            call_command('cms_remove_stray_courses')
+
+    def test_cms_remove_stray_courses_command(self):
+        """
+        Removes all courses that has only MongoDB entry.
+        """
+        CourseFactory.create()
+        call_command('cms_remove_stray_courses')
+
+    def test_cms_remove_stray_courses_command_non_to_delete(self):
+        """
+        Should not remove courses from MongoDB if it has a MySQL CourseOverview entry.
+        """
+        course = CourseFactory.create()
+        CourseOverviewFactory.create(id=course.id)
+
+        with self.assertRaises(CommandError):
+            call_command('cms_remove_stray_courses')