From b8d13812a413f0d6b932b2839a4991ec6570df91 Mon Sep 17 00:00:00 2001 From: Rebecca Graber Date: Mon, 24 Oct 2022 08:03:01 -0400 Subject: [PATCH] feat: remove constraint on and upgrade openedx-events, edx-event-bus-kafka (#31182) This will remove the "effort" field from COURSE_CATALOG_INFO_CHANGED event data --- cms/djangoapps/contentstore/signals/handlers.py | 3 --- cms/djangoapps/contentstore/signals/tests/test_handlers.py | 2 -- requirements/constraints.txt | 4 ---- requirements/edx/base.txt | 5 ++--- requirements/edx/development.txt | 5 ++--- requirements/edx/testing.txt | 5 ++--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py index 44bfdea329..d7628812d4 100644 --- a/cms/djangoapps/contentstore/signals/handlers.py +++ b/cms/djangoapps/contentstore/signals/handlers.py @@ -27,7 +27,6 @@ from common.djangoapps.util.module_utils import yield_dynamic_descriptor_descend from lms.djangoapps.grades.api import task_compute_all_grades_for_course from openedx.core.djangoapps.content.learning_sequences.api import key_supports_outlines from openedx.core.djangoapps.discussions.tasks import update_discussions_settings_from_course_task -from openedx.core.djangoapps.models.course_details import CourseDetails from openedx.core.lib.gating import api as gating_api from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import SignalHandler, modulestore @@ -84,7 +83,6 @@ def create_catalog_data_for_signal(course_key: CourseKey) -> Optional[CourseCata store = modulestore() with store.branch_setting(ModuleStoreEnum.Branch.published_only, course_key): course = store.get_course(course_key) - return CourseCatalogData( course_key=course_key.for_branch(None), # Shouldn't be necessary, but just in case... name=course.display_name, @@ -95,7 +93,6 @@ def create_catalog_data_for_signal(course_key: CourseKey) -> Optional[CourseCata enrollment_start=course.enrollment_start, enrollment_end=course.enrollment_end, ), - effort=CourseDetails.fetch_about_attribute(course_key, 'effort'), hidden=course.catalog_visibility in ['about', 'none'] or course_key.deprecated, invitation_only=course.invitation_only, ) diff --git a/cms/djangoapps/contentstore/signals/tests/test_handlers.py b/cms/djangoapps/contentstore/signals/tests/test_handlers.py index 943fe4aab2..8cb4c60018 100644 --- a/cms/djangoapps/contentstore/signals/tests/test_handlers.py +++ b/cms/djangoapps/contentstore/signals/tests/test_handlers.py @@ -39,8 +39,6 @@ class TestCatalogInfoSignal(ModuleStoreTestCase): end=None, enrollment_start=None, enrollment_end=None), - short_description=None, - effort=None, hidden=False, invitation_only=False ) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ca29908722..f030bfcefe 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -88,10 +88,6 @@ pyopenssl==22.0.0 # pytz>2022.2.1 causes test failures in edx-platform pytz==2022.2.1 -# openedx-events>0.13.0 causes test failures due to breaking changes -# These broken tests will be fixed in a separate PR -openedx-events==0.13.0 - # docutils==0.19 has removed the docutils.core.ErrorString which is required by the sphinxcontrib-openapi # This constraint can be removed once sphinxcontrib-openapi is updated to resolve this issue. docutils<0.19 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index de95aaa4bb..a2eb95a93c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -486,7 +486,7 @@ edx-enterprise==3.58.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # learner-pathway-progress -edx-event-bus-kafka==1.2.0 +edx-event-bus-kafka==1.3.0 # via -r requirements/edx/base.in edx-i18n-tools==0.9.2 # via ora2 @@ -760,9 +760,8 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.in -openedx-events==0.13.0 +openedx-events==3.0.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-event-bus-kafka openedx-filters==0.8.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 75d40fbc78..d20240b8c3 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -602,7 +602,7 @@ edx-enterprise==3.58.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # learner-pathway-progress -edx-event-bus-kafka==1.2.0 +edx-event-bus-kafka==1.3.0 # via -r requirements/edx/testing.txt edx-i18n-tools==0.9.2 # via @@ -991,9 +991,8 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/testing.txt -openedx-events==0.13.0 +openedx-events==3.0.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-event-bus-kafka openedx-filters==0.8.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 1ca5eed49d..1486312ae2 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -581,7 +581,7 @@ edx-enterprise==3.58.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # learner-pathway-progress -edx-event-bus-kafka==1.2.0 +edx-event-bus-kafka==1.3.0 # via -r requirements/edx/base.txt edx-i18n-tools==0.9.2 # via @@ -942,9 +942,8 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.txt -openedx-events==0.13.0 +openedx-events==3.0.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-event-bus-kafka openedx-filters==0.8.0