Merge branch 'master' into lunyachek/fix/instructor-rtl-remove-horizontal-scroll

Author: Lunyachek

.coveragerc

@@ -25,6 +25,7 @@ omit =
     common/djangoapps/*/migrations/*
     openedx/core/djangoapps/*/migrations/*
     openedx/core/djangoapps/debug/*
+    openedx/envs/*
     openedx/features/*/migrations/*
 
 concurrency=multiprocessing

.coveragerc-local

@@ -24,6 +24,7 @@ omit =
     common/djangoapps/*/migrations/*
     openedx/core/djangoapps/*/migrations/*
     openedx/core/djangoapps/debug/*
+    openedx/envs/*
     openedx/features/*/migrations/*
 
 concurrency=multiprocessing

.github/CODEOWNERS

@@ -2,24 +2,24 @@
 
 # Core
 common/djangoapps/student/
-common/djangoapps/student/models/__init__.py                        @openedx/2u-tnl
-common/djangoapps/student/models/course_enrollment.py               @openedx/2u-tnl
+common/djangoapps/student/models/__init__.py                        @openedx/committers-edx-platform-2u-tnl
+common/djangoapps/student/models/course_enrollment.py               @openedx/committers-edx-platform-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/commerce/                                   @openedx/2u-infinity
-openedx/core/djangoapps/credentials                                 @openedx/2U-aperture
-openedx/core/djangoapps/credit                                      @openedx/2U-aperture
-openedx/core/djangoapps/enrollments/                                @openedx/2U-aperture
+openedx/core/djangoapps/commerce/                                   @openedx/committers-edx-platform-2u-infinity
+openedx/core/djangoapps/credentials                                 @openedx/committers-edx-platform-2u-aperture
+openedx/core/djangoapps/credit                                      @openedx/committers-edx-platform-2u-aperture
+openedx/core/djangoapps/enrollments/                                @openedx/committers-edx-platform-2u-aperture
 openedx/core/djangoapps/heartbeat/
 openedx/core/djangoapps/oauth_dispatch
-openedx/core/djangoapps/user_api/                                   @openedx/2U-aperture
-openedx/core/djangoapps/user_authn/                                 @openedx/2U-infinity
-openedx/core/djangoapps/verified_track_content/                     @openedx/2u-infinity
+openedx/core/djangoapps/user_api/                                   @openedx/committers-edx-platform-2u-aperture
+openedx/core/djangoapps/user_authn/                                 @openedx/committers-edx-platform-2u-infinity
+openedx/core/djangoapps/verified_track_content/                     @openedx/committers-edx-platform-2u-infinity
 openedx/features/course_experience/
 xmodule/
 
@@ -31,21 +31,21 @@ lms/djangoapps/edxnotes
 common/djangoapps/track/
 
 # Credentials
-lms/djangoapps/certificates/                                        @openedx/2U-aperture
+lms/djangoapps/certificates/                                        @openedx/committers-edx-platform-2u-aperture
 
 # Discovery
-common/djangoapps/course_modes/                                     @openedx/2U-aperture
+common/djangoapps/course_modes/                                     @openedx/committers-edx-platform-2u-aperture
 common/djangoapps/enrollment/
-common/djangoapps/entitlements/                                     @openedx/2U-aperture
-lms/djangoapps/branding/                                            @openedx/2U-aperture
-lms/djangoapps/commerce/                                            @openedx/2u-infinity
-lms/djangoapps/experiments/                                         @openedx/2u-infinity
-lms/djangoapps/gating/                                              @openedx/2u-infinity
-lms/djangoapps/learner_dashboard/                                   @openedx/2U-aperture
-lms/djangoapps/learner_home/                                        @openedx/2U-aperture
-openedx/features/content_type_gating/                               @openedx/2u-infinity
+common/djangoapps/entitlements/                                     @openedx/committers-edx-platform-2u-aperture
+lms/djangoapps/branding/                                            @openedx/committers-edx-platform-2u-aperture
+lms/djangoapps/commerce/                                            @openedx/committers-edx-platform-2u-infinity
+lms/djangoapps/experiments/                                         @openedx/committers-edx-platform-2u-infinity
+lms/djangoapps/gating/                                              @openedx/committers-edx-platform-2u-infinity
+lms/djangoapps/learner_dashboard/                                   @openedx/committers-edx-platform-2u-aperture
+lms/djangoapps/learner_home/                                        @openedx/committers-edx-platform-2u-aperture
+openedx/features/content_type_gating/                               @openedx/committers-edx-platform-2u-infinity
 openedx/features/course_duration_limits/
-openedx/features/discounts/                                         @openedx/2u-infinity
+openedx/features/discounts/                                         @openedx/committers-edx-platform-2u-infinity
 
 # Ping Axim On-call if someone uses the QuickStart
 # https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html

.github/dependabot.yml

@@ -6,4 +6,4 @@ updates:
     schedule:
         interval: "weekly"
     reviewers:
-      - "openedx/arbi-bom"
+      - "openedx/wg-maintenance-edx-platform"

.github/workflows/add-remove-label-on-comment.yml

@@ -17,3 +17,4 @@ on:
 jobs:
   add_remove_labels:
     uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
+

.github/workflows/pylint-checks.yml

@@ -20,7 +20,7 @@ jobs:
           - module-name: openedx-1
             path: "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/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/djangoapps/course_live/"
           - module-name: openedx-2
-            path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
+            path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/envs/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
           - module-name: common
             path: "common"
           - module-name: cms

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

@@ -238,7 +238,6 @@
       "cms/djangoapps/cms_user_tasks/",
       "cms/djangoapps/course_creators/",
       "cms/djangoapps/export_course_metadata/",
-      "cms/djangoapps/import_from_modulestore/",
       "cms/djangoapps/maintenance/",
       "cms/djangoapps/models/",
       "cms/djangoapps/pipeline_js/",

.github/workflows/unit-tests.yml

@@ -82,7 +82,7 @@ jobs:
           key: docker-${{ runner.os }}-mongo-${{ matrix.mongo-version }}
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.11.0
+        uses: supercharge/mongodb-github-action@1.12.0
         with:
           mongodb-version: ${{ matrix.mongo-version }}
 

.github/workflows/upgrade-python-requirements.yml

@@ -16,8 +16,8 @@ jobs:
     uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
     with:
       branch: ${{ github.event.inputs.branch }}
-      team_reviewers: "arbi-bom"
-      email_address: arbi[email protected]
+      team_reviewers: "wg-maintenance-edx-platform"
+      email_address: orbi[email protected]
       send_success_notification: false
     secrets:
       requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}

Makefile

@@ -121,11 +121,7 @@ compile-requirements: pre-requirements $(COMMON_CONSTRAINTS_TXT) ## Re-compile *
 	@# Bootstrapping: Rebuild pip and pip-tools first, and then install them
 	@# so that if there are any failures we'll know now, rather than the next
 	@# time someone tries to use the outputs.
-	sed '/^django-simple-history==/d' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/event-tracking<2.4.1//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
+	sed 's/Django<5.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
 	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	pip-compile -v --allow-unsafe ${COMPILE_OPTS} -o requirements/pip.txt requirements/pip.in
 	pip install -r requirements/pip.txt