Merge branch 'openedx:master' into aaich/BOMS-370-retirement

Author: Akanshu-2u

.github/CODEOWNERS

@@ -2,24 +2,24 @@
 
 # Core
 common/djangoapps/student/
-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/student/models/__init__.py                        @openedx/committers-openedx-platform-2u-tnl
+common/djangoapps/student/models/course_enrollment.py               @openedx/committers-openedx-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/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/commerce/                                   @openedx/committers-openedx-platform-2u-infinity
+openedx/core/djangoapps/credentials                                 @openedx/committers-openedx-platform-2u-aperture
+openedx/core/djangoapps/credit                                      @openedx/committers-openedx-platform-2u-aperture
+openedx/core/djangoapps/enrollments/                                @openedx/committers-openedx-platform-2u-aperture
 openedx/core/djangoapps/heartbeat/
 openedx/core/djangoapps/oauth_dispatch
-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/core/djangoapps/user_api/                                   @openedx/committers-openedx-platform-2u-aperture
+openedx/core/djangoapps/user_authn/                                 @openedx/committers-openedx-platform-2u-infinity
+openedx/core/djangoapps/verified_track_content/                     @openedx/committers-openedx-platform-2u-infinity
 openedx/features/course_experience/
 # The Aximprovements team is working on extracting all built-in XBlocks
 # to the external repository (xblocks-contrib). They need to be notified
@@ -35,21 +35,21 @@ lms/djangoapps/edxnotes
 common/djangoapps/track/
 
 # Credentials
-lms/djangoapps/certificates/                                        @openedx/committers-edx-platform-2u-aperture
+lms/djangoapps/certificates/                                        @openedx/committers-openedx-platform-2u-aperture
 
 # Discovery
-common/djangoapps/course_modes/                                     @openedx/committers-edx-platform-2u-aperture
+common/djangoapps/course_modes/                                     @openedx/committers-openedx-platform-2u-aperture
 common/djangoapps/enrollment/
-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
+common/djangoapps/entitlements/                                     @openedx/committers-openedx-platform-2u-aperture
+lms/djangoapps/branding/                                            @openedx/committers-openedx-platform-2u-aperture
+lms/djangoapps/commerce/                                            @openedx/committers-openedx-platform-2u-infinity
+lms/djangoapps/experiments/                                         @openedx/committers-openedx-platform-2u-infinity
+lms/djangoapps/gating/                                              @openedx/committers-openedx-platform-2u-infinity
+lms/djangoapps/learner_dashboard/                                   @openedx/committers-openedx-platform-2u-aperture
+lms/djangoapps/learner_home/                                        @openedx/committers-openedx-platform-2u-aperture
+openedx/features/content_type_gating/                               @openedx/committers-openedx-platform-2u-infinity
 openedx/features/course_duration_limits/
-openedx/features/discounts/                                         @openedx/committers-edx-platform-2u-infinity
+openedx/features/discounts/                                         @openedx/committers-openedx-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/workflows/check-consistent-dependencies.yml

@@ -65,7 +65,7 @@ jobs:
           developers.
 
           Please see the requirements README for information on how to resolve this:
-          https://github.com/openedx/edx-platform/blob/master/requirements/README.rst#inconsistent-dependencies
+          https://github.com/openedx/openedx-platform/blob/master/requirements/README.rst#inconsistent-dependencies
           EOMARKDOWN
           )
 

.github/workflows/lint-imports.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Install python dependencies
         run: make dev-requirements
 
-      # As long there are sub-projects[1] in edx-platform, we analyze each
+      # As long there are sub-projects[1] in openedx-platform, we analyze each
       # project separately here, in order to make import-linting errors easier
       # to pinpoint.
       #

.github/workflows/unit-tests.yml

@@ -86,7 +86,7 @@ jobs:
           key: docker-${{ runner.os }}-mongo-${{ matrix.mongo-version }}
 
       - name: Start MongoDB
-        uses: supercharge/[email protected].0
+        uses: supercharge/[email protected].1
         with:
           mongodb-version: ${{ matrix.mongo-version }}
 
@@ -205,7 +205,7 @@ jobs:
         if: ${{ env.root_all_unit_tests_count != env.shards_all_unit_tests_count }}
         run: |
           echo "::error title='Unit test modules in unit-test-shards.json (unit-tests.yml workflow) are outdated'::unit tests running in unit-tests
-          workflow don't match the count for unit tests for entire edx-platform suite, please update the unit-test-shards.json under .github/workflows
+          workflow don't match the count for unit tests for entire openedx-platform suite, please update the unit-test-shards.json under .github/workflows
           to add any missing apps and match the count. for more details please take a look at scripts/gha-shards-readme.md"
           exit 1
 
@@ -272,7 +272,7 @@ jobs:
 
   # Combine and upload coverage reports.
   coverage:
-    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/openedx-platform' && (startsWith(github.base_ref, 'release') == false))
     runs-on: ubuntu-24.04
     needs: [run-tests]
     strategy:

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

@@ -12,11 +12,11 @@ on:
 jobs:
   call-upgrade-python-requirements-workflow:
     # Don't run the weekly upgrade job on forks -- it will send a weekly failure email.
-    if: github.repository == 'openedx/edx-platform' || github.event_name != 'schedule'
+    if: github.repository == 'openedx/openedx-platform' || github.event_name != 'schedule'
     uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
     with:
       branch: ${{ github.event.inputs.branch }}
-      team_reviewers: "wg-maintenance-edx-platform"
+      team_reviewers: "wg-maintenance-openedx-platform"
       email_address: [email protected]
       send_success_notification: false
     secrets:

.gitignore

@@ -11,6 +11,9 @@ requirements/edx/private.in
 requirements/edx/private.txt
 lms/envs/private.py
 cms/envs/private.py
+.venv/
+CLAUDE.md
+AGENTS.md
 # end-noclean
 
 ### Python artifacts
@@ -143,7 +146,6 @@ autodeploy.properties
 .ws_migrations_complete
 dist
 *.bak
-.venv/
 venv*/
 # Visual Studio Code
 .vscode

Makefile

@@ -55,7 +55,8 @@ pull_translations: clean_translations  ## pull translations via atlas
 	make pull_xblock_translations
 	make pull_plugin_translations
 	atlas pull $(ATLAS_OPTIONS) \
-	    translations/edx-platform/conf/locale:conf/locale
+	    translations/edx-platform/conf/locale:conf/locale \
+	    $(ATLAS_EXTRA_SOURCES)
 	python manage.py lms compilemessages
 	python manage.py lms compilejsi18n
 	python manage.py cms compilejsi18n

README.rst

@@ -5,11 +5,13 @@ Open edX Platform
 .. |License: AGPL v3| image:: https://img.shields.io/badge/License-AGPL_v3-blue.svg
   :target: https://www.gnu.org/licenses/agpl-3.0
 
-.. |Python CI| image:: https://github.com/openedx/edx-platform/actions/workflows/unit-tests.yml/badge.svg
-  :target: https://github.com/openedx/edx-platform/actions/workflows/unit-tests.yml
+.. |Python CI| image:: https://github.com/openedx/openedx-platform/actions/workflows/unit-tests.yml/badge.svg
+  :target: https://github.com/openedx/openedx-platform/actions/workflows/unit-tests.yml
 
 .. |Status| image:: https://img.shields.io/badge/status-maintained-31c653
 
+*Formerly known as "edx-platform"*
+
 Purpose
 *******
 The `Open edX Platform <https://openedx.org>`_ enables the authoring and
@@ -20,7 +22,7 @@ modular monolith, some independently deployable applications (IDAs), and
 micro-frontends (MFEs) based on the ReactJS.
 
 This repository hosts the monolith at the center of the Open edX
-platform.  Functionally, the edx-platform repository provides two services:
+platform.  Functionally, the openedx-platform repository provides two services:
 
 * CMS (Content Management Service), which powers Open edX Studio, the platform's learning content authoring environment; and
 * LMS (Learning Management Service), which delivers learning content.
@@ -53,7 +55,7 @@ For Development
 ===============
 
 Tutor also features a `development mode`_ which will also help you modify,
-test, and extend edx-platform. We recommend this method for all Open edX
+test, and extend openedx-platform. We recommend this method for all Open edX
 developers.
 
 Bare Metal (Advanced)
@@ -74,7 +76,7 @@ OS:
 
 * Ubuntu 24.04
 
-Interperters/Tools:
+Interpreters/Tools:
 
 * Python 3.11 or 3.12
 
@@ -234,7 +236,7 @@ License
 The code in this repository is licensed under version 3 of the AGPL
 unless otherwise noted. Please see the `LICENSE`_ file for details.
 
-.. _LICENSE: https://github.com/openedx/edx-platform/blob/master/LICENSE
+.. _LICENSE: https://github.com/openedx/openedx-platform/blob/master/LICENSE
 
 
 More about Open edX
@@ -271,8 +273,8 @@ We use Github Issues for our issue tracker. You can search
 `previously reported issues`_.  If you need to report a bug, or want to discuss
 a new feature before you implement it, please `create a new issue`_.
 
-.. _previously reported issues: https://github.com/openedx/edx-platform/issues
-.. _create a new issue: https://github.com/openedx/edx-platform/issues/new/choose
+.. _previously reported issues: https://github.com/openedx/openedx-platform/issues
+.. _create a new issue: https://github.com/openedx/openedx-platform/issues/new/choose
 
 
 How to Contribute
@@ -306,5 +308,4 @@ People
 
 The current maintainers of this repository can be found on `Backstage`_.
 
-.. _Backstage: https://backstage.openedx.org/catalog/default/component/edx-platform
-
+.. _Backstage: https://backstage.openedx.org/catalog/default/component/openedx-platform

catalog-info.yaml

@@ -4,7 +4,7 @@
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: 'edx-platform'
+  name: 'openedx-platform'
   description: "The monolith at the center of the Open edX platform"
   links:
     - url: "https://docs.openedx.org"
@@ -13,6 +13,6 @@ metadata:
   annotations:
     openedx.org/release: "master"
 spec:
-  owner: group:wg-maintenance-edx-platform
+  owner: group:wg-maintenance-openedx-platform
   type: 'service'
   lifecycle: 'production'

cms/djangoapps/api/v1/serializers/course_runs.py

@@ -81,15 +81,7 @@ def update_team(self, instance, team):  # lint-amnesty, pylint: disable=missing-
             )
 
 
-def image_is_jpeg_or_png(value):
-    content_type = value.content_type
-    if content_type not in list(IMAGE_TYPES.keys()):  # lint-amnesty, pylint: disable=consider-iterating-dictionary
-        raise serializers.ValidationError(
-            f'Only JPEG and PNG image types are supported. {content_type} is not valid')
-
-
 class CourseRunImageField(serializers.ImageField):  # lint-amnesty, pylint: disable=missing-class-docstring
-    default_validators = [image_is_jpeg_or_png]
 
     def get_attribute(self, instance):
         return course_image_url(instance)