From c5e9f641b77a938738453852f571c6f4e2a07efc Mon Sep 17 00:00:00 2001 From: kiram15 <31229189+kiram15@users.noreply.github.com> Date: Tue, 3 Feb 2026 22:12:04 +0000 Subject: [PATCH 1/2] feat: Upgrade Python dependency edx-enterprise Commit generated by workflow `openedx/openedx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master` --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d4b7fcb7cf46..08046c4adc3f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -44,7 +44,7 @@ django-stubs<6 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==6.6.2 +edx-enterprise==6.6.3 # Date: 2023-07-26 # Our legacy Sass code is incompatible with anything except this ancient libsass version. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index f271f9dbf440..6082e3985e5f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -470,7 +470,7 @@ edx-drf-extensions==10.6.0 # enterprise-integrated-channels # openedx-authz # openedx-learning -edx-enterprise==6.6.2 +edx-enterprise==6.6.3 # via # -c requirements/constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b1bd7aced01f..9bc95f925209 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -752,7 +752,7 @@ edx-drf-extensions==10.6.0 # enterprise-integrated-channels # openedx-authz # openedx-learning -edx-enterprise==6.6.2 +edx-enterprise==6.6.3 # via # -c requirements/constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index eb9c2442b10a..58bacb7c04bd 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -559,7 +559,7 @@ edx-drf-extensions==10.6.0 # enterprise-integrated-channels # openedx-authz # openedx-learning -edx-enterprise==6.6.2 +edx-enterprise==6.6.3 # via # -c requirements/constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ca46b7b04e39..4e37ee167f4a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -581,7 +581,7 @@ edx-drf-extensions==10.6.0 # enterprise-integrated-channels # openedx-authz # openedx-learning -edx-enterprise==6.6.2 +edx-enterprise==6.6.3 # via # -c requirements/constraints.txt # -r requirements/edx/base.txt From 917b558a5f596a2b7fa3ddd3694d3e6b671b5ad0 Mon Sep 17 00:00:00 2001 From: Kira Miller <31229189+kiram15@users.noreply.github.com> Date: Wed, 4 Feb 2026 06:35:37 +0000 Subject: [PATCH 2/2] fix: typo fix to trigger tests --- docs/decisions/0022-settings-simplification.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/decisions/0022-settings-simplification.rst b/docs/decisions/0022-settings-simplification.rst index ed10beeedc4b..8a55eadf4d77 100644 --- a/docs/decisions/0022-settings-simplification.rst +++ b/docs/decisions/0022-settings-simplification.rst @@ -11,7 +11,7 @@ Implementation tracked by: https://github.com/openedx/edx-platform/issues/36215 Context ******* -OEP-45 declares that sites will configure each IDA's (indepently-deployable +OEP-45 declares that sites will configure each IDA's (independently-deployable application's) Django settings with an ``_CFG`` YAML file, parsed and loaded by a single upstream-provided ``DJANGO_SETTINGS_MODULE``. This contrasts with the Django convention, which is that sites override Django settings using @@ -133,7 +133,7 @@ cited as a chief area of pain for Open edX developers and operators. Discussions in the Named Release Planning and Build-Test-Release Working Groups frequently are encumbered with confusion and uncertainty of what the default settings are in edx-platform, how they differ from Tutor's default settings, -what settings can be overriden, and how to do so. Only a minority of developers +what settings can be overridden, and how to do so. Only a minority of developers and operators fully understand the configuration logic described above end-to-end; even for those that do, following this override chain for any given Django setting is time-consuming and error-prone. CAT-1 bugs and high-severity @@ -170,7 +170,7 @@ that we are landing on a solid settings structure for edx-platform, we'll propose an OEP-45 update to generalize the structure to all deployable Open edX Django applications. -Finally, based on what we learn throughout this process, our OEP-45 propsal +Finally, based on what we learn throughout this process, our OEP-45 proposal will either recommend to: 1. Drop support for the ``_CFG`` YAML files, or @@ -181,7 +181,7 @@ will either recommend to: At the time, we do not have enough information whether option 1 or 2 would be more beneficial overall to the community. -`The discussion on this sub-decisision will continue on this GitHub issue `_. +`The discussion on this sub-decision will continue on this GitHub issue `_. Target settings structure for edx-platform ========================================== @@ -304,7 +304,7 @@ These steps are non-breaking unless noted. providers that use these settings modules, as they will either need to maintain local copies of these modules, or "rebase" their internal settings modules onto (cms,lms)/envs/common.py. Update operator - documenation as needed. + documentation as needed. 2. Update OEP-45 to clarify that YAML configuration is optional. Operators can opt out of YAML by deriving directly from @@ -332,7 +332,7 @@ Here is an alternate structure that would de-dupe any shared LMS/CMS dev & test logic by creating more shared modules within openedx/envs folder. Although DRYer, this structure would increase the total number of edx-platform files and potentially encourage more LMS-CMS coupling. So, we will not pursue this -structure, but will keep it in mind as an alternative if we enounter +structure, but will keep it in mind as an alternative if we encounter difficulties with the plan laid out in this ADR. * ``openedx/envs/common.py``