Merge branch 'master' into dvz/studio-editable-block-callback-refactor

.dockerignore

@@ -102,7 +102,6 @@ common/test/data/badges/*.png
 ### Static assets pipeline artifacts
 **/*.scssc
 lms/static/css/
-!lms/static/css/vendor
 lms/static/certificates/css/
 cms/static/css/
 common/static/common/js/vendor/

.github/CODEOWNERS

@@ -2,23 +2,25 @@
 
 # Ensure that the team responsible for upgrades sees any PRs that would
 # add GitHub-hosted dependencies to that platform.
-requirements/edx/github.in                                          @openedx/arbi-bom
+requirements/edx/github.in                                          @openedx/2u-arbi-bom
 
 # Core
 common/djangoapps/student/
-common/djangoapps/student/models/__init__.py                        @openedx/teaching-and-learning
-common/djangoapps/student/models/course_enrollment.py               @openedx/teaching-and-learning
+common/djangoapps/student/models/__init__.py                        @openedx/2u-tnl
+common/djangoapps/student/models/course_enrollment.py               @openedx/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/credentials                                 @openedx/2U-aperture
+openedx/core/djangoapps/credit                                      @openedx/2U-aperture
 openedx/core/djangoapps/heartbeat/
 openedx/core/djangoapps/oauth_dispatch
-openedx/core/djangoapps/user_api/
-openedx/core/djangoapps/user_authn/
+openedx/core/djangoapps/user_api/                                   @openedx/2U-aperture
+openedx/core/djangoapps/user_authn/                                 @openedx/2U-vanguards                                 
 openedx/features/course_experience/
 xmodule/
 
@@ -30,23 +32,23 @@ lms/djangoapps/edxnotes
 common/djangoapps/track/
 
 # Credentials
-lms/djangoapps/certificates/
+lms/djangoapps/certificates/                                        @openedx/2U-aperture
 
 # Discovery
 common/djangoapps/course_modes/
 common/djangoapps/enrollment/
 lms/djangoapps/commerce/
 lms/djangoapps/experiments/
-lms/djangoapps/learner_dashboard/
-lms/djangoapps/learner_home/
+lms/djangoapps/learner_dashboard/                                    @openedx/2U-aperture
+lms/djangoapps/learner_home/                                         @openedx/2U-aperture
 openedx/features/content_type_gating/
 openedx/features/course_duration_limits/
 openedx/features/discounts/
 
 # Ping Axim On-call if someone uses the QuickStart
 # https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html
-lms/templates/dashboard.html               @openedx/axim-oncall
+lms/templates/dashboard.html                                         @openedx/axim-oncall
 
 # Ensure minimal.yml stays minimal, this could be a team in the future
 # but it's just me for now, others can sign up if they care as well.
-lms/envs/minimal.yml                                            @feanil
+lms/envs/minimal.yml                                                 @feanil

.github/dependabot.yml

@@ -7,15 +7,3 @@ updates:
         interval: "weekly"
     reviewers:
       - "openedx/arbi-bom"
-  - package-ecosystem: "github-actions"
-    directory: "/.github/actions/unit-tests/"
-    schedule:
-        interval: "weekly"
-    reviewers:
-      - "openedx/arbi-bom"
-  - package-ecosystem: "github-actions"
-    directory: "/.github/actions/verify-tests-count/"
-    schedule:
-        interval: "weekly"
-    reviewers:
-      - "openedx/arbi-bom"

.github/pull_request_template.md

@@ -1,22 +1,15 @@
 <!--
 
-🌳🌳
-🌳🌳🌳🌳         🌳 Note: Quince is in support. Fixes you make on master may still be needed on Quince.
-    🌳🌳🌳🌳     If so, make another pull request against the open-release/quince.master branch,
-🌳🌳🌳🌳         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
-🌳🌳
-
-🌴🌴🌴🌴🌴🌴     🌴 Note: the Palm release is still supported.
-                Please consider whether your change should be applied to Palm as well.
+Note: Please refer to the Support Development Guidelines on the wiki page to consider backporting to active releases:
+https://openedx.atlassian.net/wiki/spaces/COMM/pages/4248436737/Support+Guidelines+for+active+releases
 
 Please give your pull request a short but descriptive title.
 Use conventional commits to separate and summarize commits logically:
 https://open-edx-proposals.readthedocs.io/en/latest/oep-0051-bp-conventional-commits.html
 
 Use this template as a guide. Omit sections that don't apply.
-You may link to information rather than copy it, but only if the link is publicly
-readable.  If you must linked information must be private (because it has secrets),
-clearly label the link as private.
+You may link to information rather than copy it, but only if the link is publicly readable.
+If the linked information must be private (because it contains secrets), clearly label the link as private.
 
 -->
 
@@ -28,6 +21,7 @@ Design decisions and their rationales should be documented in the repo (docstrin
 linked here.
 
 Useful information to include:
+
 - Which edX user roles will this change impact? Common user roles are "Learner", "Course Author",
 "Developer", and "Operator".
 - Include screenshots for changes to the UI (ideally, both "before" and "after" screenshots, if applicable).
@@ -50,6 +44,7 @@ Please provide detailed step-by-step instructions for testing this change.
 ## Other information
 
 Include anything else that will help reviewers and consumers understand the change.
+
 - Does this change depend on other changes elsewhere?
 - Any special concerns or limitations? For example: deprecations, migrations, security, or accessibility.
 - If your [database migration](https://openedx.atlassian.net/wiki/spaces/AC/pages/23003228/Everything+About+Database+Migrations) can't be rolled back easily.

.github/renovate.json5

@@ -0,0 +1,39 @@
+// This file is written in "JSON5" (https://json5.org/) so that we can use comments.
+{
+  "extends": [
+    "config:base",
+    "schedule:weekly",
+    ":automergeLinters",
+    ":automergeMinor",
+    ":automergeTesters",
+    ":enableVulnerabilityAlerts",
+    ":semanticCommits",
+    ":updateNotScheduled"
+  ],
+  "packageRules": [
+    {
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "lockFileMaintenance",
+        "minor",
+        "patch",
+        "pin"
+      ],
+      "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["@edx", "@openedx"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    }
+  ],
+  // When adding an ignoreDep, please include a reason and a public link that we can use to follow up and ensure
+  // that the ignoreDep is removed.
+  // This can be done as a comment within the ignoreDeps list.
+  "ignoreDeps": [],
+  "timezone": "America/New_York",
+  "prConcurrentLimit": 3,
+  "enabledManagers": ["npm"]
+}

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

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

.github/workflows/check-consistent-dependencies.yml

@@ -28,19 +28,19 @@ jobs:
           echo $'Paths touched in PR:\n'"$paths"
 
           # The ^"? is because git may quote weird file paths
-          matched="$(echo "$paths" | grep -P '^"?requirements/' || true)"
+          matched="$(echo "$paths" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))' || true)"
           echo $'Relevant paths:\n'"$matched"
           if [[ -n "$matched" ]]; then
               echo "RELEVANT=true" >> "$GITHUB_ENV"
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: ${{ env.RELEVANT == 'true' }}
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         if: ${{ env.RELEVANT == 'true' }}
         with:
-          python-version: '3.8'
+          python-version: '3.11'
 
       - name: "Recompile requirements"
         if: ${{ env.RELEVANT == 'true' }}

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

@@ -14,7 +14,7 @@ on:
   pull_request:
     types: [opened]
     paths:
-      - 'lms/templates/dashboard.html'
+      - "lms/templates/dashboard.html"
 
 jobs:
   # Provide helpful bot comment
@@ -23,7 +23,7 @@ jobs:
     name: provide helpful bot comment
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Comment PR
         uses: thollander/actions-comment-pull-request@v2
@@ -32,4 +32,4 @@ jobs:
             Thank you for your pull request! Congratulations on completing the Open edX tutorial! A team member will be by to take a look shortly.
             To those watching community pull requests: No need to worry about this one, a tCRIL team member will be taking care of it.
             For this PR's author: If this is a PR that is NOT coming from the Open edX tutorial, please comment and let us know to disregard this message.
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check_python_dependencies.yml

@@ -0,0 +1,40 @@
+name: Check Python Dependencies
+
+on:
+  pull_request:
+
+jobs:
+  check_dependencies:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: ["3.12"]
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install repo-tools
+        run: pip install edx-repo-tools[find_dependencies]
+
+      - name: Install setuptool
+        run: pip install setuptools  
+
+      - name: Run Python script
+        run: |
+          find_python_dependencies \
+            --req-file requirements/edx/base.txt \
+            --req-file requirements/edx/testing.txt \
+            --ignore https://github.com/edx/codejail-includes \
+            --ignore https://github.com/edx/braze-client \
+            --ignore https://github.com/edx/edx-name-affirmation \
+            --ignore https://github.com/mitodl/edx-sga \
+            --ignore https://github.com/edx/token-utils \
+            --ignore https://github.com/open-craft/xblock-poll
+  

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

@@ -8,13 +8,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.8']
-        os: ['ubuntu-20.04']
+        python-version:
+          - "3.11"
+        os: ["ubuntu-20.04"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -26,11 +27,11 @@ jobs:
 
       - name: Get pip cache dir
         id: pip-cache-dir
-        run: echo "::set-output name=dir::$(pip cache dir)"
+        run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
 
       - name: Cache pip dependencies
         id: cache-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}