diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py index 76711eaa4ddc..f66be5c0e1ff 100644 --- a/cms/djangoapps/contentstore/signals/handlers.py +++ b/cms/djangoapps/contentstore/signals/handlers.py @@ -95,7 +95,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 943fe4aab2cd..8cb4c60018c5 100644 --- a/cms/djangoapps/contentstore/signals/tests/test_handlers.py +++ b/cms/djangoapps/contentstore/signals/tests/test_handlers.py @@ -39,8 +39,6 @@ def setUp(self): end=None, enrollment_start=None, enrollment_end=None), - short_description=None, - effort=None, hidden=False, invitation_only=False ) diff --git a/cms/envs/common.py b/cms/envs/common.py index 763da41af36d..d92aa0c7a48d 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -2748,7 +2748,10 @@ def _should_send_learning_badge_events(settings): "enabled", ) -# If the consumer encounters this many consecutive errors, exit with an error. This is intended to be used in a context where a management system (such as Kubernetes) will relaunch the consumer automatically. +# If the consumer encounters this many consecutive errors, exit with an error. +# This is intended to be used in a context where a management system (such as Kubernetes) +# will relaunch the consumer automatically. + #EVENT_BUS_REDIS_CONSUMER_CONSECUTIVE_ERRORS_LIMIT (defaults to None) # How long the consumer should wait for new entries in a stream. diff --git a/lms/djangoapps/grades/events.py b/lms/djangoapps/grades/events.py index 7a02bb7d7bb5..538f3b34eef3 100644 --- a/lms/djangoapps/grades/events.py +++ b/lms/djangoapps/grades/events.py @@ -280,7 +280,7 @@ def course_grade_now_failed(user, course_id): else: COURSE_PASSING_STATUS_UPDATED.send_event( course_passing_status=CoursePassingStatusData( - status = CoursePassingStatusData.FAILING, + status=CoursePassingStatusData.FAILING, user=UserData( pii=UserPersonalData( username=user.username, diff --git a/lms/djangoapps/grades/tests/test_events.py b/lms/djangoapps/grades/tests/test_events.py index e94596e07b2e..906b0d23ee00 100644 --- a/lms/djangoapps/grades/tests/test_events.py +++ b/lms/djangoapps/grades/tests/test_events.py @@ -111,7 +111,7 @@ def test_persistent_grade_event_emitted(self): ) -class CoursePassingStatusEventsTest(SharedModuleStoreTestCase, OpenEdxEventsTestMixin): # pylint: disable=missing-class-docstring +class CoursePassingStatusEventsTest(SharedModuleStoreTestCase, OpenEdxEventsTestMixin): # pylint: disable=missing-class-docstring ENABLED_OPENEDX_EVENTS = [ "org.openedx.learning.course.passing.status.updated.v1", ] @@ -169,7 +169,7 @@ def test_course_passing_status_updated_emitted(self): ) -class CCXCoursePassingStatusEventsTest( # pylint: disable=missing-class-docstring +class CCXCoursePassingStatusEventsTest( # pylint: disable=missing-class-docstring SharedModuleStoreTestCase, OpenEdxEventsTestMixin ): ENABLED_OPENEDX_EVENTS = [ diff --git a/lms/envs/common.py b/lms/envs/common.py index 27b4b2506f09..ebd3ec8b6115 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -5275,6 +5275,7 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring EVENT_BUS_REDIS_CONNECTION_URL = "redis://:password@edx.devstack.redis:6379/" EVENT_BUS_TOPIC_PREFIX = "dev" + def _should_send_learning_badge_events(settings): return settings.FEATURES['BADGES_ENABLED'] @@ -5316,7 +5317,9 @@ def _should_send_learning_badge_events(settings): "enabled", ) -# If the consumer encounters this many consecutive errors, exit with an error. This is intended to be used in a context where a management system (such as Kubernetes) will relaunch the consumer automatically. +# If the consumer encounters this many consecutive errors, exit with an error. +# This is intended to be used in a context where a management system (such as Kubernetes) +# will relaunch the consumer automatically. #EVENT_BUS_REDIS_CONSUMER_CONSECUTIVE_ERRORS_LIMIT (defaults to None) # How long the consumer should wait for new entries in a stream. diff --git a/lms/envs/production.py b/lms/envs/production.py index 478d51bec7ca..554e8859de7a 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -1087,4 +1087,4 @@ def get_env_setting(setting): ############## Event bus producer ############## EVENT_BUS_PRODUCER_CONFIG = merge_producer_configs( EVENT_BUS_PRODUCER_CONFIG, ENV_TOKENS.get("EVENT_BUS_PRODUCER_CONFIG", {}) -) \ No newline at end of file +)