From 6ab89a71efa9f100112c9d8bec2ae0c685771958 Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Wed, 27 Sep 2023 10:47:32 -0400 Subject: [PATCH 1/6] fix: Give default for CSRF_TRUSTED_ORIGINS_WITH_SCHEME as well (#33353) This was causing failures in devstack, since lms/envs/devstack.py did not have an override like some of the other envs do. But devstack.py also doesn't specify CSRF_TRUSTED_ORIGINS; better to just update the common env to have a default. (This setting is only needed during the transition to Django 4 and will be removed after that.) --- lms/envs/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/envs/common.py b/lms/envs/common.py index 130c485fea..3cabfa06b9 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3314,6 +3314,7 @@ CSRF_COOKIE_AGE = 60 * 60 * 24 * 7 * 52 # end users CSRF_COOKIE_SECURE = False CSRF_TRUSTED_ORIGINS = [] +CSRF_TRUSTED_ORIGINS_WITH_SCHEME = [] CROSS_DOMAIN_CSRF_COOKIE_DOMAIN = '' CROSS_DOMAIN_CSRF_COOKIE_NAME = '' From e09555b561b826270cde9fce10dbb11ab70d10e3 Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Wed, 27 Sep 2023 10:50:41 -0400 Subject: [PATCH 2/6] build: Don't run the weekly upgrade workflow on forks (#33349) I get a weekly CI failure due to having a fork of edx-platform. This should stop that from happening. Also: - Dedent job name slightly so that the formatting is a little more standard - Move the `uses` key up so that it's more obvious what's being called --- .github/workflows/upgrade-python-requirements.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 911c6f0e51..fcacf81929 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -10,7 +10,10 @@ on: required: true default: 'master' jobs: - call-upgrade-python-requirements-workflow: + 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' + uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master with: branch: ${{ github.event.inputs.branch }} team_reviewers: "arbi-bom" @@ -21,5 +24,4 @@ jobs: requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} edx_smtp_username: ${{ secrets.EDX_SMTP_USERNAME }} edx_smtp_password: ${{ secrets.EDX_SMTP_PASSWORD }} - uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master From b5250c9339c3ce7d4cd8a114459bb55c7eca28d8 Mon Sep 17 00:00:00 2001 From: jszewczulak Date: Wed, 27 Sep 2023 11:21:00 -0400 Subject: [PATCH 3/6] chore: ORA bump to 5.5.0 --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 996af00f79..53d72cfb9d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -792,7 +792,7 @@ openedx-mongodbproxy==0.2.0 # via -r requirements/edx/kernel.in optimizely-sdk==4.1.1 # via -r requirements/edx/bundled.in -ora2==5.4.0 +ora2==5.5.0 # via -r requirements/edx/bundled.in oscrypto==1.3.0 # via snowflake-connector-python diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b1a99ee50e..98cea2b82b 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1330,7 +1330,7 @@ optimizely-sdk==4.1.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -ora2==5.4.0 +ora2==5.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index ad2657d3b8..3976d39b08 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -932,7 +932,7 @@ openedx-mongodbproxy==0.2.0 # via -r requirements/edx/base.txt optimizely-sdk==4.1.1 # via -r requirements/edx/base.txt -ora2==5.4.0 +ora2==5.5.0 # via -r requirements/edx/base.txt oscrypto==1.3.0 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4f986b12fc..6fd760d55a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -999,7 +999,7 @@ openedx-mongodbproxy==0.2.0 # via -r requirements/edx/base.txt optimizely-sdk==4.1.1 # via -r requirements/edx/base.txt -ora2==5.4.0 +ora2==5.5.0 # via -r requirements/edx/base.txt oscrypto==1.3.0 # via From 645a762a13162163c7fa012cf954acc6d5cf172e Mon Sep 17 00:00:00 2001 From: Kristin Aoki <42981026+KristinAoki@users.noreply.github.com> Date: Wed, 27 Sep 2023 12:09:16 -0400 Subject: [PATCH 4/6] fix: duplicate import dropdown for export page (#33348) --- cms/templates/widgets/header.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index fc93aba59d..6dd94ec78c 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -56,7 +56,6 @@ certificates_url = reverse('certificates_list_handler', kwargs={'course_key_string': str(course_key)}) checklists_url = reverse('checklists_handler', kwargs={'course_key_string': str(course_key)}) pages_and_resources_mfe_enabled = ENABLE_PAGES_AND_RESOURCES_MICROFRONTEND.is_enabled(context_course.id) - studio_home_mfe_enabled = toggles.use_new_home_page() course_outline_mfe_enabled = toggles.use_new_course_outline_page(context_course.id) updates_mfe_enabled = toggles.use_new_updates_page(context_course.id) files_uploads_mfe_enabled = toggles.use_new_files_uploads_page(context_course.id) @@ -245,7 +244,7 @@ % endif % if export_mfe_enabled:
  • - ${_("Import")} + ${_("Export")}
    • % endif % if toggles.EXPORT_GIT.is_enabled() and context_course.giturl: From c02b922659b4a7721c549b65ac26c78685b1ed3e Mon Sep 17 00:00:00 2001 From: alex-sheehan-edx Date: Wed, 27 Sep 2023 16:01:18 +0000 Subject: [PATCH 5/6] feat: Upgrade Python dependency edx-enterprise enterprise version bump 4.3.3 Commit generated by workflow `openedx/edx-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 2de3e2022a..9465159646 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -26,7 +26,7 @@ django-storages==1.14 # 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==4.3.2 +edx-enterprise==4.3.3 # django-oauth-toolkit version >=2.0.0 has breaking changes. More details # mentioned on this issue https://github.com/openedx/edx-platform/issues/32884 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 996af00f79..f62850e763 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -480,7 +480,7 @@ edx-drf-extensions==8.10.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.3.2 +edx-enterprise==4.3.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b1a99ee50e..0bf3321a5c 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -750,7 +750,7 @@ edx-drf-extensions==8.10.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.3.2 +edx-enterprise==4.3.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index ad2657d3b8..062fdbba75 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -556,7 +556,7 @@ edx-drf-extensions==8.10.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.3.2 +edx-enterprise==4.3.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4f986b12fc..bd128a8c7f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -583,7 +583,7 @@ edx-drf-extensions==8.10.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.3.2 +edx-enterprise==4.3.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt From 512bc405ccdb6509b4fe72994bdbaa7e1757aa8e Mon Sep 17 00:00:00 2001 From: jszewczulak <128841175+jszewczulak@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:53:11 -0400 Subject: [PATCH 6/6] feat: added routing keys for ORA workflow batch update (#33136) * feat: added routing key for ORA batch update --- lms/envs/common.py | 1 + lms/envs/production.py | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/lms/envs/common.py b/lms/envs/common.py index 3cabfa06b9..2c12037e92 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3772,6 +3772,7 @@ PASSWORD_POLICY_COMPLIANCE_ROLLOUT_CONFIG = { } ############################ ORA 2 ############################################ +ORA_WORKFLOW_UPDATE_ROUTING_KEY = "edx.lms.core.ora_workflow_update" # By default, don't use a file prefix ORA2_FILE_PREFIX = None diff --git a/lms/envs/production.py b/lms/envs/production.py index 0924c85e1e..0b48d461bb 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -1078,6 +1078,15 @@ EXPLICIT_QUEUES = { 'queue': PROGRAM_CERTIFICATES_ROUTING_KEY}, 'openedx.core.djangoapps.programs.tasks.award_course_certificate': { 'queue': PROGRAM_CERTIFICATES_ROUTING_KEY}, + 'openassessment.workflow.tasks.update_workflows_for_all_blocked_submissions_task': { + 'queue': ORA_WORKFLOW_UPDATE_ROUTING_KEY}, + 'openassessment.workflow.tasks.update_workflows_for_course_task': { + 'queue': ORA_WORKFLOW_UPDATE_ROUTING_KEY}, + 'openassessment.workflow.tasks.update_workflows_for_ora_block_task': { + 'queue': ORA_WORKFLOW_UPDATE_ROUTING_KEY}, + 'openassessment.workflow.tasks.update_workflow_for_submission_task': { + 'queue': ORA_WORKFLOW_UPDATE_ROUTING_KEY}, + } LOGO_IMAGE_EXTRA_TEXT = ENV_TOKENS.get('LOGO_IMAGE_EXTRA_TEXT', '')