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 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: diff --git a/lms/envs/common.py b/lms/envs/common.py index 130c485fea..2c12037e92 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 = '' @@ -3771,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', '') 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..d32dbf93e7 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 @@ -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 41ce704a25..00ec41c6f3 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -748,7 +748,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 @@ -1327,7 +1327,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..e16de083a3 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 @@ -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 a3306695eb..cc2d43b5be 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -581,7 +581,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 @@ -996,7 +996,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