Skip to content

Commit f6f32c0

Browse files
rpenidorpenido
committed
Merge branch 'master' into chris/FAL-4180-sections-subsections-publish
2 parents 27d8418 + ec72dc7 commit f6f32c0

224 files changed

Lines changed: 9108 additions & 9460 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
# Core
44
common/djangoapps/student/
5-
common/djangoapps/student/models/__init__.py @openedx/2u-tnl
6-
common/djangoapps/student/models/course_enrollment.py @openedx/2u-tnl
5+
common/djangoapps/student/models/__init__.py @openedx/committers-edx-platform-2u-tnl
6+
common/djangoapps/student/models/course_enrollment.py @openedx/committers-edx-platform-2u-tnl
77
common/djangoapps/third_party_auth/
88
lms/djangoapps/course_api/blocks
99
lms/djangoapps/courseware/
1010
lms/djangoapps/grades/
1111
lms/djangoapps/instructor/
1212
lms/djangoapps/instructor_task/
1313
lms/djangoapps/mobile_api/
14-
openedx/core/djangoapps/commerce/ @openedx/2u-infinity
15-
openedx/core/djangoapps/credentials @openedx/2U-aperture
16-
openedx/core/djangoapps/credit @openedx/2U-aperture
17-
openedx/core/djangoapps/enrollments/ @openedx/2U-aperture
14+
openedx/core/djangoapps/commerce/ @openedx/committers-edx-platform-2u-infinity
15+
openedx/core/djangoapps/credentials @openedx/committers-edx-platform-2u-aperture
16+
openedx/core/djangoapps/credit @openedx/committers-edx-platform-2u-aperture
17+
openedx/core/djangoapps/enrollments/ @openedx/committers-edx-platform-2u-aperture
1818
openedx/core/djangoapps/heartbeat/
1919
openedx/core/djangoapps/oauth_dispatch
20-
openedx/core/djangoapps/user_api/ @openedx/2U-aperture
21-
openedx/core/djangoapps/user_authn/ @openedx/2U-infinity
22-
openedx/core/djangoapps/verified_track_content/ @openedx/2u-infinity
20+
openedx/core/djangoapps/user_api/ @openedx/committers-edx-platform-2u-aperture
21+
openedx/core/djangoapps/user_authn/ @openedx/committers-edx-platform-2u-infinity
22+
openedx/core/djangoapps/verified_track_content/ @openedx/committers-edx-platform-2u-infinity
2323
openedx/features/course_experience/
2424
xmodule/
2525

@@ -31,21 +31,21 @@ lms/djangoapps/edxnotes
3131
common/djangoapps/track/
3232

3333
# Credentials
34-
lms/djangoapps/certificates/ @openedx/2U-aperture
34+
lms/djangoapps/certificates/ @openedx/committers-edx-platform-2u-aperture
3535

3636
# Discovery
37-
common/djangoapps/course_modes/ @openedx/2U-aperture
37+
common/djangoapps/course_modes/ @openedx/committers-edx-platform-2u-aperture
3838
common/djangoapps/enrollment/
39-
common/djangoapps/entitlements/ @openedx/2U-aperture
40-
lms/djangoapps/branding/ @openedx/2U-aperture
41-
lms/djangoapps/commerce/ @openedx/2u-infinity
42-
lms/djangoapps/experiments/ @openedx/2u-infinity
43-
lms/djangoapps/gating/ @openedx/2u-infinity
44-
lms/djangoapps/learner_dashboard/ @openedx/2U-aperture
45-
lms/djangoapps/learner_home/ @openedx/2U-aperture
46-
openedx/features/content_type_gating/ @openedx/2u-infinity
39+
common/djangoapps/entitlements/ @openedx/committers-edx-platform-2u-aperture
40+
lms/djangoapps/branding/ @openedx/committers-edx-platform-2u-aperture
41+
lms/djangoapps/commerce/ @openedx/committers-edx-platform-2u-infinity
42+
lms/djangoapps/experiments/ @openedx/committers-edx-platform-2u-infinity
43+
lms/djangoapps/gating/ @openedx/committers-edx-platform-2u-infinity
44+
lms/djangoapps/learner_dashboard/ @openedx/committers-edx-platform-2u-aperture
45+
lms/djangoapps/learner_home/ @openedx/committers-edx-platform-2u-aperture
46+
openedx/features/content_type_gating/ @openedx/committers-edx-platform-2u-infinity
4747
openedx/features/course_duration_limits/
48-
openedx/features/discounts/ @openedx/2u-infinity
48+
openedx/features/discounts/ @openedx/committers-edx-platform-2u-infinity
4949

5050
# Ping Axim On-call if someone uses the QuickStart
5151
# https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ updates:
66
schedule:
77
interval: "weekly"
88
reviewers:
9-
- "openedx/arbi-bom"
9+
- "openedx/wg-maintenance-edx-platform"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ on:
1717
jobs:
1818
add_remove_labels:
1919
uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
20+

‎.github/workflows/unit-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
key: docker-${{ runner.os }}-mongo-${{ matrix.mongo-version }}
8383

8484
- name: Start MongoDB
85-
uses: supercharge/mongodb-github-action@1.11.0
85+
uses: supercharge/mongodb-github-action@1.12.0
8686
with:
8787
mongodb-version: ${{ matrix.mongo-version }}
8888

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
1717
with:
1818
branch: ${{ github.event.inputs.branch }}
19-
team_reviewers: "arbi-bom"
20-
email_address: arbi-bom@edx.org
19+
team_reviewers: "wg-maintenance-edx-platform"
20+
email_address: orbi-bom@edx.org
2121
send_success_notification: false
2222
secrets:
2323
requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}

‎Makefile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ compile-requirements: pre-requirements $(COMMON_CONSTRAINTS_TXT) ## Re-compile *
121121
@# Bootstrapping: Rebuild pip and pip-tools first, and then install them
122122
@# so that if there are any failures we'll know now, rather than the next
123123
@# time someone tries to use the outputs.
124-
sed '/^django-simple-history==/d' requirements/common_constraints.txt > requirements/common_constraints.tmp
125-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
126-
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
127-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
128-
sed 's/event-tracking<2.4.1//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
124+
sed 's/Django<5.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
129125
mv requirements/common_constraints.tmp requirements/common_constraints.txt
130126
pip-compile -v --allow-unsafe ${COMPILE_OPTS} -o requirements/pip.txt requirements/pip.in
131127
pip install -r requirements/pip.txt

‎README.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ System Dependencies
7171
-------------------
7272

7373
OS:
74-
* Ubuntu 22.04
7574

7675
* Ubuntu 24.04
7776

0 commit comments

Comments
 (0)