chore: remove confluent-kafka import

edx · Oct 4, 2023 · 42bc974 · 42bc974
1 parent 90a7d44
commit 42bc974
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 89 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -1,15 +1,6 @@
 # Core requirements for using this application
 -c constraints.txt
 
-# The confluent_kafka[avro,schema-registry] dependencies should eventually be moved to some form of optional
-# dependency management because the installation of confluent_kafka poses issues for users of Tutor on M1 Macs, which
-# includes many in the Open edX community. 
-# For now, we will keep this as an explicit dependency until we plan to move edx-exams to the openedx GitHub
-# organization.
-# For more details, please see https://github.com/openedx/event-bus-kafka/blob/main/docs/decisions/
-# 0005-optional-import-of-confluent-kafka.rst.
-# TODO: Move confluent_kafka to optional dependency management: https://2u-internal.atlassian.net/browse/MST-2160
-confluent_kafka[avro,schema-registry]
 Django         # Web application framework
 django-cors-headers
 django-extensions

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -12,8 +12,6 @@ attrs==23.1.0
     # via
     #   lti-consumer-xblock
     #   openedx-events
-avro==1.11.3
-    # via confluent-kafka
 bleach==6.0.0
     # via lti-consumer-xblock
 boto3==1.28.59
@@ -36,8 +34,6 @@ click==8.1.7
     #   edx-django-utils
 code-annotations==1.5.0
     # via edx-toggles
-confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/base.in
 coreapi==2.3.3
     # via
     #   django-rest-swagger
@@ -52,7 +48,7 @@ defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
-django==3.2.21
+django==3.2.22
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -165,9 +161,7 @@ edx-toggles==5.1.0
 edx-token-utils==0.2.1
     # via -r requirements/base.in
 fastavro==1.8.4
-    # via
-    #   confluent-kafka
-    #   openedx-events
+    # via openedx-events
 fs==2.4.16
     # via
     #   fs-s3fs
@@ -227,7 +221,7 @@ openedx-django-pyfs==3.4.0
     # via
     #   lti-consumer-xblock
     #   xblock
-openedx-events==8.8.0
+openedx-events==8.9.0
     # via
     #   -r requirements/base.in
     #   edx-event-bus-kafka
@@ -286,7 +280,6 @@ redis==5.0.1
     # via walrus
 requests==2.31.0
     # via
-    #   confluent-kafka
     #   coreapi
     #   edx-drf-extensions
     #   edx-rest-api-client
@@ -355,7 +348,7 @@ xblock[django]==1.8.0
     # via
     #   lti-consumer-xblock
     #   xblock-utils
-xblock-utils==3.4.1
+xblock-utils==4.0.0
     # via lti-consumer-xblock
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -22,10 +22,6 @@ attrs==23.1.0
     #   -r requirements/validation.txt
     #   lti-consumer-xblock
     #   openedx-events
-avro==1.11.3
-    # via
-    #   -r requirements/validation.txt
-    #   confluent-kafka
 bleach==6.0.0
     # via
     #   -r requirements/validation.txt
@@ -76,8 +72,6 @@ code-annotations==1.5.0
     #   -r requirements/validation.txt
     #   edx-lint
     #   edx-toggles
-confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/validation.txt
 coreapi==2.3.3
     # via
     #   -r requirements/validation.txt
@@ -113,7 +107,7 @@ distlib==0.3.7
     # via
     #   -r requirements/validation.txt
     #   virtualenv
-django==3.2.21
+django==3.2.22
     # via
     #   -r requirements/validation.txt
     #   django-appconf
@@ -261,7 +255,6 @@ faker==19.6.2
 fastavro==1.8.4
     # via
     #   -r requirements/validation.txt
-    #   confluent-kafka
     #   openedx-events
 filelock==3.12.4
     # via
@@ -402,7 +395,7 @@ openedx-django-pyfs==3.4.0
     #   -r requirements/validation.txt
     #   lti-consumer-xblock
     #   xblock
-openedx-events==8.8.0
+openedx-events==8.9.0
     # via
     #   -r requirements/validation.txt
     #   edx-event-bus-kafka
@@ -567,7 +560,6 @@ redis==5.0.1
 requests==2.31.0
     # via
     #   -r requirements/validation.txt
-    #   confluent-kafka
     #   coreapi
     #   edx-drf-extensions
     #   edx-rest-api-client
@@ -716,7 +708,7 @@ xblock[django]==1.8.0
     #   -r requirements/validation.txt
     #   lti-consumer-xblock
     #   xblock-utils
-xblock-utils==3.4.1
+xblock-utils==4.0.0
     # via
     #   -r requirements/validation.txt
     #   lti-consumer-xblock

diff --git a/requirements/django.txt b/requirements/django.txt
@@ -1 +1 @@
-django==3.2.21
+django==3.2.22
diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -24,10 +24,6 @@ attrs==23.1.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   openedx-events
-avro==1.11.3
-    # via
-    #   -r requirements/test.txt
-    #   confluent-kafka
 babel==2.13.0
     # via sphinx
 bleach==6.0.0
@@ -74,8 +70,6 @@ code-annotations==1.5.0
     #   -r requirements/test.txt
     #   edx-lint
     #   edx-toggles
-confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/test.txt
 coreapi==2.3.3
     # via
     #   -r requirements/test.txt
@@ -109,7 +103,7 @@ distlib==0.3.7
     # via
     #   -r requirements/test.txt
     #   virtualenv
-django==3.2.21
+django==3.2.22
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/test.txt
@@ -260,7 +254,6 @@ faker==19.6.2
 fastavro==1.8.4
     # via
     #   -r requirements/test.txt
-    #   confluent-kafka
     #   openedx-events
 filelock==3.12.4
     # via
@@ -390,7 +383,7 @@ openedx-django-pyfs==3.4.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   xblock
-openedx-events==8.8.0
+openedx-events==8.9.0
     # via
     #   -r requirements/test.txt
     #   edx-event-bus-kafka
@@ -537,7 +530,6 @@ redis==5.0.1
 requests==2.31.0
     # via
     #   -r requirements/test.txt
-    #   confluent-kafka
     #   coreapi
     #   edx-drf-extensions
     #   edx-rest-api-client
@@ -701,7 +693,7 @@ xblock[django]==1.8.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   xblock-utils
-xblock-utils==3.4.1
+xblock-utils==4.0.0
     # via
     #   -r requirements/test.txt
     #   lti-consumer-xblock

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -17,10 +17,6 @@ attrs==23.1.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   openedx-events
-avro==1.11.3
-    # via
-    #   -r requirements/base.txt
-    #   confluent-kafka
 bleach==6.0.0
     # via
     #   -r requirements/base.txt
@@ -56,8 +52,6 @@ code-annotations==1.5.0
     # via
     #   -r requirements/base.txt
     #   edx-toggles
-confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/base.txt
 coreapi==2.3.3
     # via
     #   -r requirements/base.txt
@@ -77,7 +71,7 @@ defusedxml==0.8.0rc2
     #   -r requirements/base.txt
     #   python3-openid
     #   social-auth-core
-django==3.2.21
+django==3.2.22
     # via
     #   -r requirements/base.txt
     #   django-appconf
@@ -205,7 +199,6 @@ edx-token-utils==0.2.1
 fastavro==1.8.4
     # via
     #   -r requirements/base.txt
-    #   confluent-kafka
     #   openedx-events
 fs==2.4.16
     # via
@@ -299,7 +292,7 @@ openedx-django-pyfs==3.4.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   xblock
-openedx-events==8.8.0
+openedx-events==8.9.0
     # via
     #   -r requirements/base.txt
     #   edx-event-bus-kafka
@@ -388,7 +381,6 @@ redis==5.0.1
 requests==2.31.0
     # via
     #   -r requirements/base.txt
-    #   confluent-kafka
     #   coreapi
     #   edx-drf-extensions
     #   edx-rest-api-client
@@ -488,7 +480,7 @@ xblock[django]==1.8.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   xblock-utils
-xblock-utils==3.4.1
+xblock-utils==4.0.0
     # via
     #   -r requirements/base.txt
     #   lti-consumer-xblock

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -22,10 +22,6 @@ attrs==23.1.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   openedx-events
-avro==1.11.3
-    # via
-    #   -r requirements/test.txt
-    #   confluent-kafka
 bleach==6.0.0
     # via
     #   -r requirements/test.txt
@@ -68,8 +64,6 @@ code-annotations==1.5.0
     #   -r requirements/test.txt
     #   edx-lint
     #   edx-toggles
-confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/test.txt
 coreapi==2.3.3
     # via
     #   -r requirements/test.txt
@@ -103,7 +97,7 @@ distlib==0.3.7
     # via
     #   -r requirements/test.txt
     #   virtualenv
-django==3.2.21
+django==3.2.22
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/test.txt
@@ -248,7 +242,6 @@ faker==19.6.2
 fastavro==1.8.4
     # via
     #   -r requirements/test.txt
-    #   confluent-kafka
     #   openedx-events
 filelock==3.12.4
     # via
@@ -376,7 +369,7 @@ openedx-django-pyfs==3.4.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   xblock
-openedx-events==8.8.0
+openedx-events==8.9.0
     # via
     #   -r requirements/test.txt
     #   edx-event-bus-kafka
@@ -521,7 +514,6 @@ redis==5.0.1
 requests==2.31.0
     # via
     #   -r requirements/test.txt
-    #   confluent-kafka
     #   coreapi
     #   edx-drf-extensions
     #   edx-rest-api-client
@@ -659,7 +651,7 @@ xblock[django]==1.8.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   xblock-utils
-xblock-utils==3.4.1
+xblock-utils==4.0.0
     # via
     #   -r requirements/test.txt
     #   lti-consumer-xblock

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -21,10 +21,6 @@ attrs==23.1.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   openedx-events
-avro==1.11.3
-    # via
-    #   -r requirements/base.txt
-    #   confluent-kafka
 bleach==6.0.0
     # via
     #   -r requirements/base.txt
@@ -66,8 +62,6 @@ code-annotations==1.5.0
     #   -r requirements/test.in
     #   edx-lint
     #   edx-toggles
-confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/base.txt
 coreapi==2.3.3
     # via
     #   -r requirements/base.txt
@@ -235,7 +229,6 @@ faker==19.6.2
 fastavro==1.8.4
     # via
     #   -r requirements/base.txt
-    #   confluent-kafka
     #   openedx-events
 filelock==3.12.4
     # via
@@ -337,7 +330,7 @@ openedx-django-pyfs==3.4.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   xblock
-openedx-events==8.8.0
+openedx-events==8.9.0
     # via
     #   -r requirements/base.txt
     #   edx-event-bus-kafka
@@ -459,7 +452,6 @@ redis==5.0.1
 requests==2.31.0
     # via
     #   -r requirements/base.txt
-    #   confluent-kafka
     #   coreapi
     #   edx-drf-extensions
     #   edx-rest-api-client
@@ -576,7 +568,7 @@ xblock[django]==1.8.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   xblock-utils
-xblock-utils==3.4.1
+xblock-utils==4.0.0
     # via
     #   -r requirements/base.txt
     #   lti-consumer-xblock