Skip to content

Commit d6aaed2

Browse files
xitij2000xitij2000
authored
Merge branch 'master' into kshitij/acknowledgements
2 parents 969a3b8 + 18d5abb commit d6aaed2

File tree

879 files changed

+66372
-54158
lines changed

Some content is hidden

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

879 files changed

+66372
-54158
lines changed

‎.coveragerc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ omit =
2525
common/djangoapps/*/migrations/*
2626
openedx/core/djangoapps/*/migrations/*
2727
openedx/core/djangoapps/debug/*
28+
openedx/envs/*
2829
openedx/features/*/migrations/*
2930

3031
concurrency=multiprocessing

‎.coveragerc-local‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ omit =
2424
common/djangoapps/*/migrations/*
2525
openedx/core/djangoapps/*/migrations/*
2626
openedx/core/djangoapps/debug/*
27+
openedx/envs/*
2728
openedx/features/*/migrations/*
2829

2930
concurrency=multiprocessing

‎.github/CODEOWNERS‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,30 @@
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/
24-
xmodule/
24+
# The Aximprovements team is working on extracting all built-in XBlocks
25+
# to the external repository (xblocks-contrib). They need to be notified
26+
# about any changes within xmodule to stay aligned with this effort.
27+
# Ticket: https://github.com/openedx/edx-platform/issues/34827
28+
xmodule/ @farhan @irtazaakram @salman2013
2529

2630
# Core Extensions
2731
lms/djangoapps/discussion/
@@ -31,21 +35,21 @@ lms/djangoapps/edxnotes
3135
common/djangoapps/track/
3236

3337
# Credentials
34-
lms/djangoapps/certificates/ @openedx/2U-aperture
38+
lms/djangoapps/certificates/ @openedx/committers-edx-platform-2u-aperture
3539

3640
# Discovery
37-
common/djangoapps/course_modes/ @openedx/2U-aperture
41+
common/djangoapps/course_modes/ @openedx/committers-edx-platform-2u-aperture
3842
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
43+
common/djangoapps/entitlements/ @openedx/committers-edx-platform-2u-aperture
44+
lms/djangoapps/branding/ @openedx/committers-edx-platform-2u-aperture
45+
lms/djangoapps/commerce/ @openedx/committers-edx-platform-2u-infinity
46+
lms/djangoapps/experiments/ @openedx/committers-edx-platform-2u-infinity
47+
lms/djangoapps/gating/ @openedx/committers-edx-platform-2u-infinity
48+
lms/djangoapps/learner_dashboard/ @openedx/committers-edx-platform-2u-aperture
49+
lms/djangoapps/learner_home/ @openedx/committers-edx-platform-2u-aperture
50+
openedx/features/content_type_gating/ @openedx/committers-edx-platform-2u-infinity
4751
openedx/features/course_duration_limits/
48-
openedx/features/discounts/ @openedx/2u-infinity
52+
openedx/features/discounts/ @openedx/committers-edx-platform-2u-infinity
4953

5054
# Ping Axim On-call if someone uses the QuickStart
5155
# 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/check-consistent-dependencies.yml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ name: Consistent Python dependencies
77

88
on:
99
pull_request:
10+
merge_group:
1011

1112
defaults:
1213
run:
@@ -18,26 +19,31 @@ jobs:
1819
runs-on: ubuntu-24.04
1920

2021
steps:
22+
# Always checkout the code because we don't always have a PR url.
23+
- uses: actions/checkout@v5
24+
2125
# Only run remaining steps if there are changes to requirements/**
26+
# We do this instead of using path based short-circuiting.
27+
# see https://stackoverflow.com/questions/77996177/how-can-i-handle-a-required-check-that-isnt-always-triggered
28+
# for some more details.
2229
- name: "Decide whether to short-circuit"
23-
env:
24-
GH_TOKEN: "${{ github.token }}"
25-
PR_URL: "${{ github.event.pull_request.html_url }}"
2630
run: |
27-
paths=$(gh pr diff "$PR_URL" --name-only)
28-
echo $'Paths touched in PR:\n'"$paths"
31+
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
32+
BASE_SHA="${{ github.event.pull_request.base.sha }}"
33+
else
34+
BASE_SHA="${{ github.event.merge_group.base_sha }}"
35+
fi
36+
37+
# Fetch the base sha so we can compare to it. It's not checked out by
38+
# default.
39+
git fetch origin "$BASE_SHA"
2940
3041
# The ^"? is because git may quote weird file paths
31-
matched="$(echo "$paths" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))' || true)"
32-
echo $'Relevant paths:\n'"$matched"
33-
if [[ -n "$matched" ]]; then
34-
echo "RELEVANT=true" >> "$GITHUB_ENV"
42+
if git diff --name-only "$BASE_SHA" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))'; then
43+
echo "RELEVANT=true" >> "$GITHUB_ENV"
3544
fi
3645
37-
- uses: actions/checkout@v4
38-
if: ${{ env.RELEVANT == 'true' }}
39-
40-
- uses: actions/setup-python@v5
46+
- uses: actions/setup-python@v6
4147
if: ${{ env.RELEVANT == 'true' }}
4248
with:
4349
python-version: '3.11'

‎.github/workflows/check-for-tutorial-prs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
name: provide helpful bot comment
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727

2828
- name: Comment PR
29-
uses: thollander/actions-comment-pull-request@v2
29+
uses: thollander/actions-comment-pull-request@v3
3030
with:
3131
message: |
3232
Thank you for your pull request! Congratulations on completing the Open edX tutorial! A team member will be by to take a look shortly.

‎.github/workflows/check_python_dependencies.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Check Python Dependencies
22

33
on:
44
pull_request:
5+
merge_group:
56

67
jobs:
78
check_dependencies:
@@ -13,10 +14,10 @@ jobs:
1314

1415
steps:
1516
- name: Checkout Repository
16-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1718

1819
- name: Set up Python
19-
uses: actions/setup-python@v5
20+
uses: actions/setup-python@v6
2021
with:
2122
python-version: ${{ matrix.python-version }}
2223

‎.github/workflows/ci-static-analysis.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Static analysis
22

3-
on: pull_request
3+
on:
4+
pull_request:
5+
merge_group:
46

57
jobs:
68
tests:
@@ -13,9 +15,9 @@ jobs:
1315
os: ["ubuntu-24.04"]
1416

1517
steps:
16-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1719
- name: Set up Python
18-
uses: actions/setup-python@v5
20+
uses: actions/setup-python@v6
1921
with:
2022
python-version: ${{ matrix.python-version }}
2123

‎.github/workflows/commitlint.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
name: Lint Commit Messages
44

55
on:
6-
- pull_request
6+
pull_request:
7+
merge_group:
78

89
jobs:
910
commitlint:

0 commit comments

Comments
 (0)