diff --git a/event_routing_backends/tests/test_settings.py b/event_routing_backends/tests/test_settings.py index 95f1ef13..3137ef6b 100644 --- a/event_routing_backends/tests/test_settings.py +++ b/event_routing_backends/tests/test_settings.py @@ -20,8 +20,7 @@ def test_common_settings(self): Test common settings """ common_settings.plugin_settings(settings) - self.assertIn('xapi', settings.EVENT_TRACKING_BACKENDS) - self.assertIn('caliper', settings.EVENT_TRACKING_BACKENDS) + self.assertIn('event_bus', settings.EVENT_TRACKING_BACKENDS) self.assertIn('edx.course.enrollment.activated', settings.EVENT_TRACKING_BACKENDS_BUSINESS_CRITICAL_EVENTS) self.assertFalse(settings.CALIPER_EVENTS_ENABLED) self.assertFalse(settings.CALIPER_EVENT_LOGGING_ENABLED) @@ -33,8 +32,7 @@ def test_devstack_settings(self): Test devstack settings """ devstack_settings.plugin_settings(settings) - self.assertIn('xapi', settings.EVENT_TRACKING_BACKENDS) - self.assertIn('caliper', settings.EVENT_TRACKING_BACKENDS) + self.assertIn('event_bus', settings.EVENT_TRACKING_BACKENDS) self.assertIn('edx.course.enrollment.deactivated', settings.EVENT_TRACKING_BACKENDS_BUSINESS_CRITICAL_EVENTS) self.assertFalse(settings.CALIPER_EVENTS_ENABLED) self.assertFalse(settings.CALIPER_EVENT_LOGGING_ENABLED) diff --git a/requirements/base.in b/requirements/base.in index 7b8413ba..5ee63605 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -11,8 +11,8 @@ django-fernet-fields-v2 django-config-models edx-toggles # For SettingToggle class tincan -event-tracking +git+https://github.com/edunext/event-tracking@cag/add-openedx-event-signal edx-celeryutils apache-libcloud # For bulk event log loading fasteners # Locking tools, required by apache-libcloud, but somehow not installed with it -openedx-events +git+https://github.com/edunext/openedx-events@cag/add-openedx-event-signal diff --git a/requirements/base.txt b/requirements/base.txt index 598f72bb..cddef4fb 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -92,8 +92,10 @@ edx-django-utils==5.7.0 edx-opaque-keys[django]==2.5.1 # via openedx-events edx-toggles==5.1.0 - # via -r requirements/base.in -event-tracking==2.2.0 + # via + # -r requirements/base.in + # event-tracking +event-tracking @ git+https://github.com/edunext/event-tracking@cag/add-openedx-event-signal # via -r requirements/base.in fastavro==1.8.4 # via openedx-events @@ -115,7 +117,7 @@ markupsafe==2.1.3 # via jinja2 newrelic==9.1.1 # via edx-django-utils -openedx-events==9.0.0 +openedx-events @ git+https://github.com/edunext/openedx-events@cag/add-openedx-event-signal # via -r requirements/base.in pbr==5.11.1 # via stevedore diff --git a/requirements/dev.txt b/requirements/dev.txt index 062ae41f..56896633 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -175,8 +175,10 @@ edx-opaque-keys[django]==2.5.1 # edx-opaque-keys # openedx-events edx-toggles==5.1.0 - # via -r requirements/quality.txt -event-tracking==2.2.0 + # via + # -r requirements/quality.txt + # event-tracking +event-tracking @ git+https://github.com/edunext/event-tracking@cag/add-openedx-event-signal # via -r requirements/quality.txt exceptiongroup==1.1.3 # via @@ -251,7 +253,7 @@ newrelic==9.1.1 # via # -r requirements/quality.txt # edx-django-utils -openedx-events==9.0.0 +openedx-events @ git+https://github.com/edunext/openedx-events@cag/add-openedx-event-signal # via -r requirements/quality.txt packaging==23.2 # via diff --git a/requirements/doc.txt b/requirements/doc.txt index b5bb963d..36da793b 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -163,8 +163,10 @@ edx-opaque-keys[django]==2.5.1 # edx-opaque-keys # openedx-events edx-toggles==5.1.0 - # via -r requirements/test.txt -event-tracking==2.2.0 + # via + # -r requirements/test.txt + # event-tracking +event-tracking @ git+https://github.com/edunext/event-tracking@cag/add-openedx-event-signal # via -r requirements/test.txt exceptiongroup==1.1.3 # via @@ -240,7 +242,7 @@ newrelic==9.1.1 # edx-django-utils nh3==0.2.14 # via readme-renderer -openedx-events==9.0.0 +openedx-events @ git+https://github.com/edunext/openedx-events@cag/add-openedx-event-signal # via -r requirements/test.txt packaging==23.2 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 7cc5cffc..b35a038e 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -151,8 +151,10 @@ edx-opaque-keys[django]==2.5.1 # edx-opaque-keys # openedx-events edx-toggles==5.1.0 - # via -r requirements/test.txt -event-tracking==2.2.0 + # via + # -r requirements/test.txt + # event-tracking +event-tracking @ git+https://github.com/edunext/event-tracking@cag/add-openedx-event-signal # via -r requirements/test.txt exceptiongroup==1.1.3 # via @@ -208,7 +210,7 @@ newrelic==9.1.1 # via # -r requirements/test.txt # edx-django-utils -openedx-events==9.0.0 +openedx-events @ git+https://github.com/edunext/openedx-events@cag/add-openedx-event-signal # via -r requirements/test.txt packaging==23.2 # via diff --git a/requirements/test.txt b/requirements/test.txt index e5f89072..49ab6487 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -137,8 +137,10 @@ edx-opaque-keys[django]==2.5.1 # edx-opaque-keys # openedx-events edx-toggles==5.1.0 - # via -r requirements/base.txt -event-tracking==2.2.0 + # via + # -r requirements/base.txt + # event-tracking +event-tracking @ git+https://github.com/edunext/event-tracking@cag/add-openedx-event-signal # via -r requirements/base.txt exceptiongroup==1.1.3 # via pytest @@ -182,7 +184,7 @@ newrelic==9.1.1 # via # -r requirements/base.txt # edx-django-utils -openedx-events==9.0.0 +openedx-events @ git+https://github.com/edunext/openedx-events@cag/add-openedx-event-signal # via -r requirements/base.txt packaging==23.2 # via pytest